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

Merge branch temp8 into temp8-di2690

Browse Source
This commit is contained in:
Stephan
2018-10-23 18:01:52 +02:00
parent 0d5bf5e9c6 e34728c10c
commit d71c879374
355 changed files with 6101 additions and 13589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs
View File

@@ -19,13 +19,12 @@ namespace Umbraco.Web.Install.InstallSteps
{
get
{
var currentVersion = UmbracoVersion.Local;
//fixme - in this case there's a db but the version is cleared which is fine and a normal way to force the upgrader
// to execute, but before we would detect the current version via the DB like DatabaseSchemaResult.DetermineInstalledVersion
// what now, do we need to?
if (currentVersion == null)
currentVersion = new Semver.SemVersion(0);
// fixme - if UmbracoVersion.Local is null?
// it means that there is a database but the web.config version is cleared
// that was a "normal" way to force the upgrader to execute, and we would detect the current
// version via the DB like DatabaseSchemaResult.DetermineInstalledVersion - magic, do we really
// need this now?
var currentVersion = (UmbracoVersion.Local ?? new Semver.SemVersion(0)).ToString();
var newVersion = UmbracoVersion.SemanticVersion.ToString();