Revert to explicit list of migrations. Migrations were enumerated multiple times

so added ToList() to them.
This commit is contained in:
Sebastiaan Janssen
2013-01-21 10:01:14 -01:00
parent e2b86cf2df
commit 84e4727ef5
2 changed files with 23 additions and 6 deletions

View File

@@ -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<Type>
{
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());

View File

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