diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable.cs similarity index 94% rename from src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable.cs rename to src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable.cs index 66822e09f1..fcae11bfa5 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable.cs @@ -1,9 +1,9 @@ using System.Linq; using Umbraco.Core.Configuration; -namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFiveZero +namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionEight { - [Migration("7.5.0", 100, GlobalSettings.UmbracoMigrationName)] + [Migration("8.0.0", 100, GlobalSettings.UmbracoMigrationName)] public class AddRedirectUrlTable : MigrationBase { public AddRedirectUrlTable(IMigrationContext context) diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable2.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable2.cs similarity index 95% rename from src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable2.cs rename to src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable2.cs index 3da1e0a069..37fb5c417d 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable2.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable2.cs @@ -1,9 +1,9 @@ using System.Linq; using Umbraco.Core.Configuration; -namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFiveZero +namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionEight { - [Migration("7.5.0", 101, GlobalSettings.UmbracoMigrationName)] + [Migration("8.0.0", 101, GlobalSettings.UmbracoMigrationName)] public class AddRedirectUrlTable2 : MigrationBase { public AddRedirectUrlTable2(IMigrationContext context) diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable3.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable3.cs similarity index 96% rename from src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable3.cs rename to src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable3.cs index 08bf095003..3d4aa05a2e 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable3.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable3.cs @@ -1,9 +1,9 @@ using System.Linq; using Umbraco.Core.Configuration; -namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFiveZero +namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionEight { - [Migration("7.5.0", 102, GlobalSettings.UmbracoMigrationName)] + [Migration("8.0.0", 102, GlobalSettings.UmbracoMigrationName)] public class AddRedirectUrlTable3 : MigrationBase { public AddRedirectUrlTable3(IMigrationContext context) diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable4.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable4.cs similarity index 96% rename from src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable4.cs rename to src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable4.cs index 2404408165..7bde77bdda 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable4.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable4.cs @@ -1,9 +1,9 @@ using System.Linq; using Umbraco.Core.Configuration; -namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFiveZero +namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionEight { - [Migration("7.5.0", 103, GlobalSettings.UmbracoMigrationName)] + [Migration("8.0.0", 103, GlobalSettings.UmbracoMigrationName)] public class AddRedirectUrlTable4 : MigrationBase { public AddRedirectUrlTable4(IMigrationContext context) diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 7b7c96fb22..ae8c53358f 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -351,10 +351,10 @@ - - - - + + + + @@ -1339,6 +1339,7 @@ + diff --git a/src/Umbraco.Tests/Migrations/MigrationIssuesTests.cs b/src/Umbraco.Tests/Migrations/MigrationIssuesTests.cs index d2b6503a41..8df9b8e142 100644 --- a/src/Umbraco.Tests/Migrations/MigrationIssuesTests.cs +++ b/src/Umbraco.Tests/Migrations/MigrationIssuesTests.cs @@ -7,8 +7,8 @@ using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Persistence.Migrations; +using Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionEight; using Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven; -using Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFiveZero; using Umbraco.Core.Services; using Umbraco.Tests.TestHelpers; using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings; @@ -111,8 +111,8 @@ namespace Umbraco.Tests.Migrations Mock.Of(), Mock.Of(), logger, - new SemVersion(7, 4, 0), new SemVersion(7, 5, 0), + new SemVersion(8, 0, 0), GlobalSettings.UmbracoMigrationName, //pass in explicit migrations @@ -127,7 +127,7 @@ namespace Umbraco.Tests.Migrations Assert.IsTrue(upgraded); } - [Migration("7.5.0", 99, GlobalSettings.UmbracoMigrationName)] + [Migration("8.0.0", 99, GlobalSettings.UmbracoMigrationName)] public class DeleteRedirectUrlTable : MigrationBase { public DeleteRedirectUrlTable(IMigrationContext context)