Skip to content

Commit 51b132f

Browse files
committed
New Release: a couple of changes:
1. NHibernate Automapping enabled. 2. Separaion of .Name from base entity; IEntity now refers to entities with name; others use IBaseEntity. Other changes can be seen using the commit log. Hopefully that's enough.
1 parent 43cc995 commit 51b132f

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

IoCContainers/MultiTenancyFramework.SimpleInjector/MultiTenancyFramework.SimpleInjector.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>$id$</id>
5-
<version>1.0.0.10</version>
5+
<version>1.0.0.11</version>
66
<title>$title$</title>
77
<authors>$author$</authors>
88
<owners>$author$</owners>
@@ -13,7 +13,7 @@
1313
<copyright>Copyright 2016</copyright>
1414
<tags>SaaS MultiTenant MultiTenancy Framework Software-as-a-Service IoC SimpleInjector</tags>
1515
<dependencies>
16-
<dependency id="MultiTenancyFramework.Core" version="1.0.0.10" />
16+
<dependency id="MultiTenancyFramework.Core" version="1.0.0.11" />
1717
</dependencies>
1818
</metadata>
1919
</package>

MVC5/MultiTenancyFramework.Mvc.NHibernate/MultiTenancyFramework.Mvc.NHibernate.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>$id$</id>
5-
<version>1.0.0.10</version>
5+
<version>1.0.0.11</version>
66
<title>$title$</title>
77
<authors>$author$</authors>
88
<owners>$author$</owners>
@@ -13,9 +13,9 @@
1313
<copyright>$copyright$</copyright>
1414
<tags>SaaS MultiTenant MultiTenancy Framework Software-as-a-Service MVC5 NHibernate FluentNHibernate</tags>
1515
<dependencies>
16-
<dependency id="MultiTenancyFramework.Core" version="1.0.0.10" />
17-
<dependency id="MultiTenancyFramework.Mvc" version="1.0.0.10" />
18-
<dependency id="MultiTenancyFramework.NHibernate" version="1.0.0.10" />
16+
<dependency id="MultiTenancyFramework.Core" version="1.0.0.11" />
17+
<dependency id="MultiTenancyFramework.Mvc" version="1.0.0.11" />
18+
<dependency id="MultiTenancyFramework.NHibernate" version="1.0.0.11" />
1919
</dependencies>
2020
</metadata>
2121
<files>

MVC5/MultiTenancyFramework.Mvc/MultiTenancyFramework.Mvc.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>$id$</id>
5-
<version>1.0.0.10</version>
5+
<version>1.0.0.11</version>
66
<title>$title$</title>
77
<authors>$author$</authors>
88
<owners>$author$</owners>
@@ -13,7 +13,7 @@
1313
<copyright>Copyright 2016</copyright>
1414
<tags>SaaS MultiTenant MultiTenancy Framework Software-as-a-Service MVC5</tags>
1515
<dependencies>
16-
<dependency id="MultiTenancyFramework.Core" version="1.0.0.10" />
16+
<dependency id="MultiTenancyFramework.Core" version="1.0.0.11" />
1717
</dependencies>
1818
</metadata>
1919
</package>

MultiTenancyFramework.Core/MultiTenancyFramework.Core.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>$id$</id>
5-
<version>1.0.0.10</version>
5+
<version>1.0.0.11</version>
66
<title>$title$</title>
77
<authors>$author$</authors>
88
<owners>$author$</owners>

MultiTenancyFramework.NHibernate/MultiTenancyFramework.NHibernate.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>$id$</id>
5-
<version>1.0.0.10</version>
5+
<version>1.0.0.11</version>
66
<title>$title$</title>
77
<authors>$author$</authors>
88
<owners>$author$</owners>
@@ -13,7 +13,7 @@
1313
<copyright>$copyright$</copyright>
1414
<tags>SaaS MultiTenant MultiTenancy Framework Software-as-a-Service MVC5 NHibernate FluentNHibernate</tags>
1515
<dependencies>
16-
<dependency id="MultiTenancyFramework.Core" version="1.0.0.10" />
16+
<dependency id="MultiTenancyFramework.Core" version="1.0.0.11" />
1717
</dependencies>
1818
</metadata>
1919
<files>

MultiTenancyFramework.NHibernate/NHManager/NHSessionManager.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ private static AutoPersistenceModel AddMappingAssembliesTo(string instCode, Conf
459459

460460
AutoPersistenceModel autoPersistenceModel = new AutoPersistenceModel(new AutomappingConfiguration());
461461

462-
// Check for ClassMap<> or .hbm type mapping files
462+
// Check for automap overrides, ClassMap<> or .hbm type mapping files
463463
if (hc.SessionFactory != null)
464464
{
465465
var mappingAssemblies = new HashSet<string>(hc.SessionFactory.Mappings.Select(x => x.Assembly));
@@ -483,6 +483,9 @@ private static AutoPersistenceModel AddMappingAssembliesTo(string instCode, Conf
483483

484484
// Looks for fluent mappings
485485
autoPersistenceModel.AddMappingsFromAssembly(assembly);
486+
487+
// Looks for auto-mapping overrides
488+
autoPersistenceModel.UseOverridesFromAssembly(assembly);
486489
}
487490

488491
cfg.BeforeBindMapping += (sender, args) => args.Mapping.autoimport = false;
@@ -495,19 +498,16 @@ private static AutoPersistenceModel AddMappingAssembliesTo(string instCode, Conf
495498
// 'Core' first
496499
var entityAssembly = typeof(Entity).Assembly;
497500
autoPersistenceModel.AddEntityAssembly(entityAssembly);
498-
autoPersistenceModel.UseOverridesFromAssembly(entityAssembly);
499501

500502
// The rest
501-
EntityAssemblies.Add(ThisAssembly);
502503
var entityAssemblyName = entityAssembly.GetName().Name;
503504
foreach (var assemblyName in EntityAssemblies)
504505
{
505506
if (assemblyName.Equals(entityAssemblyName, StringComparison.OrdinalIgnoreCase)) continue;
506507

507-
// Looks for Automapping overrides and automap
508+
// Looks for automap
508509
var assembly = Assembly.Load(assemblyName);
509510
autoPersistenceModel.AddEntityAssembly(assembly);
510-
autoPersistenceModel.UseOverridesFromAssembly(assembly);
511511
}
512512

513513
bool notCoreInst = !instCode.Equals(Utilities.INST_DEFAULT_CODE, StringComparison.OrdinalIgnoreCase);
@@ -566,7 +566,7 @@ private static Configuration ConfigureNHibernate(string cfgFile, IDictionary<str
566566
cfg.Properties.Add(Environment.Isolation, "ReadCommitted");
567567
cfg.Properties.Add(Environment.ProxyFactoryFactoryClass, "NHibernate.Bytecode.DefaultProxyFactoryFactory, NHibernate");
568568
cfg.Properties.Add(Environment.CurrentSessionContextClass, "web");
569-
569+
570570
return cfg;
571571
}
572572

0 commit comments

Comments
 (0)