Merge pull request #10 from fredericDelaporte/v5.0.0

Release v5.0.0

Author: fredericDelaporte

.gitignore

@@ -62,6 +62,12 @@ dlldata.c
 # Chutzpah Test files
 _Chutzpah*
 
+# Visual Studio user settings directory
+.vs
+
+# Visual Studio Code user settings directory
+.vscode
+
 # Visual C++ cache files
 ipch/
 *.aps
@@ -81,6 +87,9 @@ $tf/
 # Guidance Automation Toolkit
 *.gpState
 
+# JetBrains Rider IDE user settings directory
+.idea
+
 # ReSharper is a .NET coding add-in
 _ReSharper*/
 *.[Rr]e[Ss]harper

src/NHibernate.Mapping.Attributes.Test/DomainModel.Reference.hbm.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated from NHibernate.Mapping.Attributes on 2011-08-13 16:13:06Z.-->
 <hibernate-mapping auto-import="true" default-lazy="true" xmlns="urn:nhibernate-mapping-2.2">
-  <import class="NHibernate.Mapping.Attributes.Test.DomainModel.Glarch, NHibernate.Mapping.Attributes.Test" />
   <import class="Double" rename="RealNumber" />
+  <import class="NHibernate.Mapping.Attributes.Test.DomainModel.Glarch, NHibernate.Mapping.Attributes.Test" />
   <class name="NHibernate.Mapping.Attributes.Test.DomainModel.Baz, NHibernate.Mapping.Attributes.Test" proxy="NHibernate.Mapping.Attributes.Test.DomainModel.Baz, NHibernate.Mapping.Attributes.Test" discriminator-value="base" mutable="false" polymorphism="explicit" where="1" persister="NHibernate.Mapping.Attributes.Test.DomainModel.Baz, NHibernate.Mapping.Attributes.Test" batch-size="9" check="0">
     <id name="Code" access="Int32" column="Id" type="String" length="8" unsaved-value="null">
       <column name="baz_id" length="32" />
@@ -297,15 +297,15 @@
   <joined-subclass extends="Guid" name="X+PrivS+PrivJ, NHibernate.Mapping.Attributes.Test">
     <key />
     <property name="userPattern" type="X+PrivS+PrivC, NHMA.Test" />
-    <property name="sqlPattern" type="NHibernate.UserTypes.SqlTypes.SqlDateTimeType, NHibernate.UserTypes.SqlTypes" />
+    <property name="sqlPattern" type="NHibernate.UserTypes.SqlTypes.SqlDateTimeType, NHibernate.UserTypes.SqlTypes, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <joined-subclass name="X+PrivS+PrivJ+C+IntJ, NHibernate.Mapping.Attributes.Test" extends="Guid">
       <key />
     </joined-subclass>
   </joined-subclass>
   <subclass extends="Guid" name="X+PrivS, NHibernate.Mapping.Attributes.Test" />
   <union-subclass entity-name="NHibernate.Mapping.Attributes.Test.DomainModel.Foo, NHibernate.Mapping.Attributes.Test" proxy="NHibernate.Mapping.Attributes.Test.DomainModel.UnionSubclass, NHibernate.Mapping.Attributes.Test" table="uT" schema="none" select-before-update="true" extends="NHibernate.Mapping.Attributes.Test.DomainModel.Baz, NHibernate.Mapping.Attributes.Test" abstract="false" check="maybe">
     <meta attribute="Meta">Content</meta>
-    <tuplizer entity-mode="xml" class="FakeClass" />
+    <tuplizer entity-mode="dynamic-map" class="FakeClass" />
   </union-subclass>
   <joined-subclass name="NHibernate.Mapping.Attributes.Test.DomainModel.JoinedBaz, NHibernate.Mapping.Attributes.Test" proxy="NHibernate.Mapping.Attributes.Test.DomainModel.JoinedBaz, NHibernate.Mapping.Attributes.Test" schema-action="X" select-before-update="true" extends="NHibernate.Mapping.Attributes.Test.DomainModel.Baz, NHibernate.Mapping.Attributes.Test">
     <meta attribute="Meta">Content</meta>

src/NHibernate.Mapping.Attributes.Test/DomainModel.cs

@@ -1018,7 +1018,7 @@ public interface Sql
 	public interface UnionSubclass
 	{
 		[NHMA.Meta(0, Attribute = "Meta", Content = "Content")]
-		[NHMA.Tuplizer(1, Class = "FakeClass", EntityMode = NHMA.TuplizerEntityMode.Xml)]
+		[NHMA.Tuplizer(1, Class = "FakeClass", EntityMode = NHMA.TuplizerEntityMode.DynamicMap)]
 		object Object { get; }
 	}
 	#endregion

src/NHibernate.Mapping.Attributes.Test/SerializationFixture.cs

@@ -110,7 +110,8 @@ private void Compare(Stream stream, string refFilePath)
 					refLine = refReader.ReadLine();
 					if (l != 2 && line != refLine) // line 2 contain a comment
 						throw new Exception(string.Format(
-						                    	"Difference at line {0}:{3}Src={1}{3}Ref={2}", l, line, refLine, Environment.NewLine));
+						                        "Difference with {4} at line {0}:{3}Src={1}{3}Ref={2}",
+						                        l, line, refLine, Environment.NewLine, Path.GetFileName(refFilePath)));
 				} while (line != null && refLine != null);
 			}
 		}

src/NHibernate.Mapping.Attributes/ArrayAttribute.cs

@@ -36,8 +36,6 @@ public class ArrayAttribute : BaseAttribute
 
 		private string _catalog = null;
 
-		private bool _embedxml = true;
-		
 		private bool _inverse = false;
 
 		private string _table = null;
@@ -52,8 +50,6 @@ public class ArrayAttribute : BaseAttribute
 
 		private bool _inversespecified;
 
-		private bool _embedxmlspecified;
-		
 		private CollectionFetchMode _fetch = CollectionFetchMode.Unspecified;
 
 		private string _elementclass = null;
@@ -410,28 +406,5 @@ public virtual string Node
 				this._node = value;
 			}
 		}
-		
-		/// <summary> </summary>
-		public virtual bool EmbedXml
-		{
-			get
-			{
-				return this._embedxml;
-			}
-			set
-			{
-				this._embedxml = value;
-				_embedxmlspecified = true;
-			}
-		}
-		
-		/// <summary> Tells if EmbedXml has been specified. </summary>
-		public virtual bool EmbedXmlSpecified
-		{
-			get
-			{
-				return this._embedxmlspecified;
-			}
-		}
 	}
 }

src/NHibernate.Mapping.Attributes/AssemblyInfo.cs

@@ -8,9 +8,9 @@
 [assembly: AssemblyCompanyAttribute("NHibernate.org")]
 [assembly: AssemblyProductAttribute("NHibernate.Mapping.Attributes")]
 [assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
-[assembly: AssemblyVersionAttribute("4.0.0.1")]
-[assembly: AssemblyInformationalVersionAttribute("4.0.0.1")]
-[assembly: AssemblyFileVersionAttribute("4.0.0.1")]
+[assembly: AssemblyVersionAttribute("5.0.0")]
+[assembly: AssemblyInformationalVersionAttribute("5.0.0")]
+[assembly: AssemblyFileVersionAttribute("5.0.0.0")]
 //[assembly: AssemblyKeyFileAttribute("../../src/NHibernate.snk")]
 [assembly: AssemblyDelaySignAttribute(false)]
 [assembly: AllowPartiallyTrustedCallers]

src/NHibernate.Mapping.Attributes/BagAttribute.cs

@@ -26,59 +26,55 @@ namespace NHibernate.Mapping.Attributes
 	public class BagAttribute : BaseAttribute
 	{
 
-		private string _persister = null;
-		
-		private string _where = null;
+		private bool _inversespecified;
 
-		private string _schema = null;
+		private string _access = null;
 
-		private bool _mutablespecified;
+		private string _collectiontype = null;
 
-		private bool _generic = false;
+		private CollectionLazy _lazy = CollectionLazy.Unspecified;
 
 		private string _catalog = null;
 
-		private bool _mutable = true;
-		
 		private string _orderby = null;
 
-		private long _batchsize = -9223372036854775808;
+		private bool _inverse = false;
 
-		private CollectionFetchMode _fetch = CollectionFetchMode.Unspecified;
+		private string _table = null;
 
-		private string _subselect = null;
+		private string _schema = null;
 
-		private string _table = null;
+		private OuterJoinStrategy _outerjoin = OuterJoinStrategy.Unspecified;
 
-		private bool _embedxml = true;
+		private bool _optimisticlock = true;
 
-		private bool _inverse = false;
+		private string _persister = null;
 
 		private string _cascade = null;
 
-		private string _name = null;
+		private CollectionFetchMode _fetch = CollectionFetchMode.Unspecified;
 
-		private string _node = null;
+		private bool _genericspecified;
 
-		private bool _inversespecified;
+		private string _node = null;
 
-		private OuterJoinStrategy _outerjoin = OuterJoinStrategy.Unspecified;
+		private string _subselect = null;
 
-		private CollectionLazy _lazy = CollectionLazy.Unspecified;
+		private bool _mutable = true;
 
-		private bool _embedxmlspecified;
+		private string _name = null;
 
-		private string _access = null;
+		private bool _mutablespecified;
 
-		private bool _genericspecified;
+		private string _check = null;
 
-		private bool _optimisticlockspecified;
+		private long _batchsize = -9223372036854775808;
 
-		private string _check = null;
+		private string _where = null;
 
-		private bool _optimisticlock = true;
+		private bool _optimisticlockspecified;
 
-		private string _collectiontype = null;
+		private bool _generic = false;
 
 		/// <summary> Default constructor (position=0) </summary>
 		public BagAttribute() : 
@@ -430,29 +426,6 @@ public virtual string Node
 			}
 		}
 
-		/// <summary> </summary>
-		public virtual bool EmbedXml
-		{
-			get
-			{
-				return this._embedxml;
-			}
-			set
-			{
-				this._embedxml = value;
-				_embedxmlspecified = true;
-			}
-		}
-		
-		/// <summary> Tells if EmbedXml has been specified. </summary>
-		public virtual bool EmbedXmlSpecified
-		{
-			get
-			{
-				return this._embedxmlspecified;
-			}
-		}
-		
 		/// <summary>The concrete collection should use a generic version or an object-based version.</summary>
 		public virtual bool Generic
 		{

src/NHibernate.Mapping.Attributes/FlushMode.cs

@@ -31,12 +31,16 @@ public enum FlushMode
 		[System.Xml.Serialization.XmlEnumAttribute("auto")]
 		Auto,
 
-		/// <summary>never</summary>
-		[System.Xml.Serialization.XmlEnumAttribute("never")]
-		Never,
+		/// <summary>manual</summary>
+		[System.Xml.Serialization.XmlEnumAttribute("manual")]
+		Manual,
 
 		/// <summary>always</summary>
 		[System.Xml.Serialization.XmlEnumAttribute("always")]
 		Always,
+		
+		/// <summary>never</summary>
+		[System.Xml.Serialization.XmlEnumAttribute("never")]
+		Never,
 	}
 }