diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs index 4a9ab5f182..eda2cf494c 100644 --- a/src/Umbraco.Core/CoreBootManager.cs +++ b/src/Umbraco.Core/CoreBootManager.cs @@ -135,9 +135,26 @@ namespace Umbraco.Core MacroPropertyTypeResolver.Current = new MacroPropertyTypeResolver( PluginManager.Current.ResolveMacroPropertyTypes()); - //the database migration objects - MigrationResolver.Current = new MigrationResolver( - PluginManager.Current.ResolveMigrationTypes()); + //TODO: Y U NO WORK? + //MigrationResolver.Current = new MigrationResolver( + // PluginManager.Current.ResolveMigrationTypes()); + + //the database migration objects + MigrationResolver.Current = new MigrationResolver(new List + { + typeof (MigrationsVersionFourNineZero.RemoveUmbracoAppConstraints), + typeof (DeleteAppTables), + typeof (EnsureAppsTreesUpdated), + typeof (MoveMasterContentTypeData), + typeof (NewCmsContentType2ContentTypeTable), + typeof (RemoveMasterContentTypeColumn), + typeof (RenameCmsTabTable), + typeof (RenameTabIdColumn), + typeof (UpdateCmsContentTypeAllowedContentTypeTable), + typeof (UpdateCmsContentTypeTable), + typeof (UpdateCmsContentVersionTable), + typeof (UpdateCmsPropertyTypeGroupTable) + }); PropertyEditorValueConvertersResolver.Current = new PropertyEditorValueConvertersResolver( PluginManager.Current.ResolvePropertyEditorValueConverters()); diff --git a/src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs b/src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs index ed86495007..74721961dd 100644 --- a/src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs +++ b/src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs @@ -48,9 +48,9 @@ namespace Umbraco.Core.Persistence.Migrations var foundMigrations = MigrationResolver.Current.Migrations; var migrations = isUpgrade - ? OrderedUpgradeMigrations(foundMigrations) - : OrderedDowngradeMigrations(foundMigrations); - + ? OrderedUpgradeMigrations(foundMigrations).ToList() + : OrderedDowngradeMigrations(foundMigrations).ToList(); + if (Migrating.IsRaisedEventCancelled(new MigrationEventArgs(migrations, _configuredVersion, _targetVersion, true), this)) return false;