Merge

--HG--
branch : dev

src/Orchard.Tests/Data/Builders/SessionFactoryBuilderTests.cs

@@ -64,12 +64,12 @@ namespace Orchard.Tests.Data.Builders {
             var parameters = new SessionFactoryParameters {
                 Provider = "SQLite",
                 DataFolder = _tempDataFolder,
-                UpdateSchema = true,
                 RecordDescriptors = recordDescriptors
             };
             var sessionFactory = manager
                 .CreateProvider(parameters)
-                .BuildSessionFactory(parameters);
+                .BuildConfiguration(parameters)
+                .BuildSessionFactory();
 
 
             var session = sessionFactory.OpenSession();
@@ -102,12 +102,12 @@ namespace Orchard.Tests.Data.Builders {
                 Provider = "SqlServer",
                 DataFolder = _tempDataFolder,
                 ConnectionString = "Data Source=.\\SQLEXPRESS;AttachDbFileName=" + databasePath + ";Integrated Security=True;User Instance=True;",
-                UpdateSchema = true,
                 RecordDescriptors = recordDescriptors,
             };
             var sessionFactory = manager
                 .CreateProvider(parameters)
-                .BuildSessionFactory(parameters);
+                .BuildConfiguration(parameters)
+                .BuildSessionFactory();
 
 
 

src/Orchard.Tests/DataMigration/DataMigrationTests.cs

@@ -59,7 +59,6 @@ namespace Orchard.Tests.DataMigration {
             builder.RegisterInstance(_folders).As<IExtensionFolders>();
             builder.RegisterType<ExtensionManager>().As<IExtensionManager>();
             builder.RegisterType<DataMigrationManager>().As<IDataMigrationManager>();
-            builder.RegisterType<DefaultDataMigrationGenerator>().As<IDataMigrationGenerator>();
             builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
             _session = _sessionFactory.OpenSession();
             builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As<ISessionLocator>();

src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs

@@ -1,5 +1,4 @@
 using System.Data;
-using System.Linq;
 using Autofac;
 using NHibernate;
 using NUnit.Framework;