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

Retarget migrations after merge

Browse Source
This commit is contained in:
Stephan
2016-07-18 10:54:27 +02:00
parent 2594fa423f
commit d04efbf5a4
6 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable.cs → src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable.cs
View File

@@ -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)

4
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable2.cs → src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable2.cs
View File

@@ -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)

4
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable3.cs → src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable3.cs
View File

@@ -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)

4
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFiveZero/AddRedirectUrlTable4.cs → src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionEight/AddRedirectUrlTable4.cs
View File

@@ -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)

9
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -351,10 +351,10 @@
<Compile Include="Persistence\Mappers\MigrationEntryMapper.cs" />
<Compile Include="Persistence\Migrations\LocalMigrationContext.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionFourOneZero\AddPreviewXmlTable.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\AddRedirectUrlTable4.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\AddRedirectUrlTable3.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\AddRedirectUrlTable2.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\AddRedirectUrlTable.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionEight\AddRedirectUrlTable4.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionEight\AddRedirectUrlTable3.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionEight\AddRedirectUrlTable2.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionEight\AddRedirectUrlTable.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFourZero\FixListViewMediaSortOrder.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFourZero\AddDataDecimalColumn.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFourZero\AddUmbracoDeployTables.cs" />
@@ -1339,6 +1339,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Folder Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\" />
<Folder Include="PublishedCache\" />
</ItemGroup>
<ItemGroup />

6
src/Umbraco.Tests/Migrations/MigrationIssuesTests.cs
View File

@@ -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<IMigrationResolver>(),
Mock.Of<IMigrationEntryService>(),
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)