Merge branch 'master' of github.com:nhibernate/nhibernate-core into oracle-dtc

Author: hazzik

build-common/common.xml

@@ -196,7 +196,7 @@
 		<property name="link.sdkdoc.version" value="SDK_v1_1" />
 		<!-- merge should work with 4.0 when compiling for 4.0 -->
 		<property name="merge.targetplatform" value="v4" />
-		<property name="referenceassemblies.dir" value="${environment::get-folder-path('ProgramFiles')}\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.2" />
+		<property name="referenceassemblies.dir" value="${environment::get-folder-path('ProgramFiles')}\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1" />
 	</target>
 
 	<target name="set-net-3.5-framework-configuration">

releasenotes.txt

@@ -1,18 +1,25 @@
-Build 4.1.0.CR1
+Build 4.1.0.GA
 =============================
 
-    ##### Possible Breaking Changes #####
+    ##### Possible Breaking Changes Since 4.0 #####
     Proxies for classes that used lazy fields (not collections)
     would have any exceptions from the entity wrapped in TargetInvocationException. This
     wrapping exception have now been removed. Where relevant, you should instead catch
     the original exception type you throw.
 
-	For LINQ queries, the startAt parameter and the return value for string.IndexOf() are
-	now correctly translated from .Net's 0-based indexing to SQL's 1-based indexing. LINQ
-	queries that are written to expect SQL semantics for IndexOf() will likely need to be
-	asjusted (NH-3846, NH-3901).
-	Example: A LINQ query should now use 'x=>x.Name.IndexOf("a") == -1' to pick objects where
-	the name doesn't contain the letter "a".
+    For LINQ queries, the startAt parameter and the return value for string.IndexOf() are
+    now correctly translated from .Net's 0-based indexing to SQL's 1-based indexing. LINQ
+    queries that are written to expect SQL semantics for IndexOf() will likely need to be
+    adjusted (NH-3846, NH-3901).
+    Example: A LINQ query should now use 'x=>x.Name.IndexOf("a") == -1' to pick objects where
+    the name doesn't contain the letter "a".
+
+** Bug
+    * [NH-3885] - ThreadSafeDictionary is not threadsafe
+
+
+Build 4.1.0.CR1
+=============================
 
 ** Bug
     * [NH-2038] - No substring length check in RemoveAsAliasesFromSql
@@ -47,7 +54,7 @@ Build 4.1.0.CR1
     * [NH-3666] - Setting native sql query cachable causes ArgumentNullException in CacheableResultTransformer.
     * [NH-3681] - NHibernate.HibernateException: Query Source could not be identified, when using join group and Sum()
     * [NH-3706] - NHibernate.Transform.Transformers should be static class
-    * [NH-3727] -  Criteria which use SubqueryProjection. Cannot be executed more than once. Second try throws exception.
+    * [NH-3727] - Criteria which use SubqueryProjection. Cannot be executed more than once. Second try throws exception.
     * [NH-3741] - Many to Many mapping against interfaces fails (reverts to using ElementRelationMapper instead of ManyToManyRelationMapper)
     * [NH-3743] - Fetch with GroupBy throws NullReferenceException
     * [NH-3747] - Very weak support for predicates in Linq Aggregate functions 
@@ -445,6 +452,13 @@ Build 4.0.0.Alpha1
     * [NH-3347] - Remove obsolete dialects for NH4
 
 
+Build 3.4.1.GA
+=============================
+
+** Bug
+    * [NH-3795] - C# compiler "Roslyn" regression
+
+
 Build 3.4.0.GA
 =============================
 ** Known BREAKING CHANGES from NH3.3.0.GA to NH3.4.0.GA
@@ -531,6 +545,14 @@ Build 3.4.0.CR1
 ** Task
     * [NH-3251] - Update to antlr 3.5.0.2
 
+
+Build 3.3.5.GA
+=============================
+
+** Bug
+    * [NH-3795] - C# compiler "Roslyn" regression
+
+
 Build 3.3.4.GA
 =============================
 

src/NHibernate.DomainModel/NHibernate.DomainModel.csproj

@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>

src/NHibernate.Everything.sln

@@ -67,7 +67,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NHibernate.Test", "NHiberna
 EndProject
 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "NHibernate.Example.Web", "NHibernate.Example.Web\", "{C5D6EE68-1760-4F97-AD31-42343593D8C1}"
 	ProjectSection(WebsiteProperties) = preProject
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.6.1"
 		ProjectReferences = "{5909BFE7-93CF-4E5F-BE22-6293368AF01D}|NHibernate.dll;"
 		Debug.AspNetCompiler.VirtualPath = "/NHibernate.Example.Web"
 		Debug.AspNetCompiler.PhysicalPath = "NHibernate.Example.Web\"

src/NHibernate.Example.Web/Web.Config

@@ -23,7 +23,7 @@
             affects performance, set this value to true only 
             during development.
         -->
-    <compilation debug="true" targetFramework="4.0"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <!--
             The <authentication> section enables configuration 
             of the security authentication mode used by 
@@ -49,7 +49,9 @@
     </httpModules>
   </system.web>
   <hibernate-configuration xmlns="urn:nhibernate-configuration-2.2">
-    <bytecode-provider type="null"/><!-- Important under Medium Trust -->
+    <!-- Important under Medium Trust -->
+    <bytecode-provider type="null"/>
+
     <session-factory>
       <property name="connection.provider">NHibernate.Connection.DriverConnectionProvider, NHibernate</property>
       <property name="connection.connection_string">

src/NHibernate.Test.VisualBasic/Issues/NH3302/Fixture.vb

@@ -6,7 +6,7 @@ Namespace Issues
 
     Namespace NH3302
         'http://msdn.microsoft.com/en-us/library/swf8kaxw.aspx
-        <TestFixture(), Ignore()> _
+        <TestFixture(), Ignore("Not fixed yet.")> _
         Public Class Fixture
             Inherits IssueTestCase
 

src/NHibernate.Test.VisualBasic/NHibernate.Test.VisualBasic.vbproj

@@ -13,7 +13,7 @@
     <AssemblyName>NHibernate.Test.VisualBasic</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <TargetFrameworkProfile />
     <StartAction>Program</StartAction>
     <StartProgram>$(MSBuildProjectDirectory)\..\..\Tools\nunit\nunit-x86.exe</StartProgram>

src/NHibernate.Test/App.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 
 	<configSections>
@@ -98,7 +98,7 @@
 
 	</log4net>
 
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
 	<runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<dependentAssembly>

src/NHibernate.Test/CfgTest/AccessorsSerializableTest.cs

@@ -9,26 +9,26 @@ public class AccessorsSerializableTest
 	{
 		private static System.Type[] accessors = typeof (IPropertyAccessor).Assembly.GetTypes().Where(t => t.Namespace == typeof (IPropertyAccessor).Namespace && t.GetInterfaces().Contains(typeof (IPropertyAccessor))).ToArray();
 
-		[Test, TestCaseSource("accessors")]
+		[Test, TestCaseSource(nameof(accessors))]
 		public void AllAccessorsAreMarkedAsSerializable(System.Type concreteAccessor)
 		{
 			Assert.That(concreteAccessor, Has.Attribute<SerializableAttribute>());
 		}
 
 		private static System.Type[] setters = typeof(ISetter).Assembly.GetTypes().Where(t => t.Namespace == typeof(ISetter).Namespace && t.GetInterfaces().Contains(typeof(ISetter))).ToArray();
 
-		[Test, TestCaseSource("setters")]
+		[Test, TestCaseSource(nameof(setters))]
 		public void AllSettersAreMarkedAsSerializable(System.Type concreteAccessor)
 		{
 			Assert.That(concreteAccessor, Has.Attribute<SerializableAttribute>());
 		}
 
 		private static System.Type[] getters = typeof(IGetter).Assembly.GetTypes().Where(t => t.Namespace == typeof(IGetter).Namespace && t.GetInterfaces().Contains(typeof(IGetter))).ToArray();
 
-		[Test, TestCaseSource("getters")]
+		[Test, TestCaseSource(nameof(getters))]
 		public void AllGettersAreMarkedAsSerializable(System.Type concreteAccessor)
 		{
 			Assert.That(concreteAccessor, Has.Attribute<SerializableAttribute>());
 		}
 	}
-}
+}

src/NHibernate.Test/CfgTest/ConfigurationFixture.cs

@@ -27,7 +27,7 @@ public class ConfigurationFixture
 		public void ReadCfgXmlFromDefaultFile()
 		{
 			Configuration cfg = new Configuration();
-			cfg.Configure("TestEnbeddedConfig.cfg.xml");
+			cfg.Configure(Path.Combine(TestContext.CurrentContext.TestDirectory, "TestEnbeddedConfig.cfg.xml"));
 
 			Assert.IsTrue(cfg.Properties.ContainsKey(Environment.ShowSql));
 			Assert.IsTrue(cfg.Properties.ContainsKey(Environment.UseQueryCache));
@@ -91,16 +91,16 @@ public void ReadCfgXmlFromAssembly()
 		public void InvalidXmlInCfgFile()
 		{
 			XmlDocument cfgXml = new XmlDocument();
-			cfgXml.Load("TestEnbeddedConfig.cfg.xml");
+			cfgXml.Load(Path.Combine(TestContext.CurrentContext.TestDirectory, "TestEnbeddedConfig.cfg.xml"));
 
 			// this should put us at the first <property> element
 			XmlElement propElement = cfgXml.DocumentElement.GetElementsByTagName("property")[0] as XmlElement;
 
 			// removing this will cause it not to validate
 			propElement.RemoveAttribute("name");
 
-			const string FileNameForInvalidCfg = "hibernate.invalid.cfg.xml";
-      cfgXml.Save(FileNameForInvalidCfg);
+			string FileNameForInvalidCfg = Path.Combine(TestContext.CurrentContext.TestDirectory, "hibernate.invalid.cfg.xml");
+			cfgXml.Save(FileNameForInvalidCfg);
 
 			Configuration cfg = new Configuration();
 			try
@@ -222,7 +222,7 @@ public void CacheConfiguration()
 		[Test]
 		public void InvalidXmlInHbmFile()
 		{
-			string filename = "invalid.hbm.xml";
+			string filename = Path.Combine(TestContext.CurrentContext.TestDirectory, "invalid.hbm.xml");
 			// it's missing the class name - won't validate
 			string hbm =
 				@"<?xml version='1.0' encoding='utf-8' ?> 
@@ -432,7 +432,7 @@ public SampleQueryProvider(ISessionImplementor session) : base(session)
 		public void NH2890Standard()
 		{
 			var cfg = new Configuration();
-			cfg.Configure("TestEnbeddedConfig.cfg.xml")
+			cfg.Configure(Path.Combine(TestContext.CurrentContext.TestDirectory, "TestEnbeddedConfig.cfg.xml"))
 				.LinqQueryProvider<SampleQueryProvider>()
 				.SetDefaultAssembly("NHibernate.DomainModel")
 				.SetDefaultNamespace("NHibernate.DomainModel");
@@ -451,7 +451,7 @@ public void NH2890Standard()
 		public void NH2890Xml()
 		{
 			var cfg = new Configuration();
-			cfg.Configure("TestEnbeddedConfig.cfg.xml")
+			cfg.Configure(Path.Combine(TestContext.CurrentContext.TestDirectory, "TestEnbeddedConfig.cfg.xml"))
 				.SetDefaultAssembly("NHibernate.DomainModel")
 				.SetDefaultNamespace("NHibernate.DomainModel");
 

src/NHibernate.Test/CfgTest/DefaultNsAssmFixture.cs

@@ -97,33 +97,33 @@ public class DefaultNsAssmFixture
 		[TestFixtureSetUp]
 		public void TestFixtureSetUp()
 		{
-			dir_ = Directory.GetCurrentDirectory();
+			dir_ = TestContext.CurrentContext.TestDirectory;
 
 			// Create hbm files (ideally, we could just embed them directly into the
 			// assembly - same as VS does when 'Build Action' = 'Embedded Resource' - but
 			// I could not find a way to do this, so we use files instead)
 
-			StreamWriter aw = new StreamWriter("A1.hbm.xml");
+			StreamWriter aw = new StreamWriter(Path.Combine(dir_, "A1.hbm.xml"));
 			aw.Write(aJoinedHbmXml);
 			aw.Close();
 
-			StreamWriter bw = new StreamWriter("B1.hbm.xml");
+			StreamWriter bw = new StreamWriter(Path.Combine(dir_, "B1.hbm.xml"));
 			bw.Write(bJoinedHbmXml);
 			bw.Close();
 
-			StreamWriter cw = new StreamWriter("C1.hbm.xml");
+			StreamWriter cw = new StreamWriter(Path.Combine(dir_, "C1.hbm.xml"));
 			cw.Write(cJoinedHbmXml);
 			cw.Close();
 
-			StreamWriter asw = new StreamWriter("A1.subclass.hbm.xml");
+			StreamWriter asw = new StreamWriter(Path.Combine(dir_, "A1.subclass.hbm.xml"));
 			asw.Write(aJoinedHbmXml);
 			asw.Close();
 
-			StreamWriter bsw = new StreamWriter("B1.subclass.hbm.xml");
+			StreamWriter bsw = new StreamWriter(Path.Combine(dir_, "B1.subclass.hbm.xml"));
 			bsw.Write(bJoinedHbmXml);
 			bsw.Close();
 
-			StreamWriter csw = new StreamWriter("C1.subclass.hbm.xml");
+			StreamWriter csw = new StreamWriter(Path.Combine(dir_, "C1.subclass.hbm.xml"));
 			csw.Write(cJoinedHbmXml);
 			csw.Close();
 		}
@@ -151,15 +151,15 @@ public void TopDownJoined()
 			AssemblyName assemblyName = new AssemblyName();
 			assemblyName.Name = "MyTestA1.dll";
 			AssemblyBuilder assemblyBuilder =
-				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
+				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave, dir_);
 			ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name, assemblyName.Name, true);
 			assemblyBuilder.AddResourceFile("A.hbm.xml", "A1.hbm.xml");
 			assemblyBuilder.AddResourceFile("B.hbm.xml", "B1.hbm.xml");
 			assemblyBuilder.AddResourceFile("C.hbm.xml", "C1.hbm.xml");
 			assemblyBuilder.Save(assemblyName.Name);
 
 			Configuration cfg = new Configuration();
-			cfg.AddAssembly(Assembly.LoadFile(dir_ + "/" + assemblyName.Name));
+			cfg.AddAssembly(Assembly.LoadFile(Path.Combine(dir_, assemblyName.Name)));
 			// if no exception, success
 		}
 
@@ -169,15 +169,15 @@ public void BottomUpJoined()
 			AssemblyName assemblyName = new AssemblyName();
 			assemblyName.Name = "MyTestB1.dll";
 			AssemblyBuilder assemblyBuilder =
-				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
+				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave, dir_);
 			ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name, assemblyName.Name, true);
 			assemblyBuilder.AddResourceFile("C.hbm.xml", "C1.hbm.xml");
 			assemblyBuilder.AddResourceFile("B.hbm.xml", "B1.hbm.xml");
 			assemblyBuilder.AddResourceFile("A.hbm.xml", "A1.hbm.xml");
 			assemblyBuilder.Save(assemblyName.Name);
 
 			Configuration cfg = new Configuration();
-			cfg.AddAssembly(Assembly.LoadFile(dir_ + "/" + assemblyName.Name));
+			cfg.AddAssembly(Assembly.LoadFile(Path.Combine(dir_, assemblyName.Name)));
 			// if no exception, success
 		}
 
@@ -187,15 +187,15 @@ public void MixedJoined()
 			AssemblyName assemblyName = new AssemblyName();
 			assemblyName.Name = "MyTestC1.dll";
 			AssemblyBuilder assemblyBuilder =
-				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
+				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave, dir_);
 			ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name, assemblyName.Name, true);
 			assemblyBuilder.AddResourceFile("B.hbm.xml", "B1.hbm.xml");
 			assemblyBuilder.AddResourceFile("A.hbm.xml", "A1.hbm.xml");
 			assemblyBuilder.AddResourceFile("C.hbm.xml", "C1.hbm.xml");
 			assemblyBuilder.Save(assemblyName.Name);
 
 			Configuration cfg = new Configuration();
-			cfg.AddAssembly(Assembly.LoadFile(dir_ + "/" + assemblyName.Name));
+			cfg.AddAssembly(Assembly.LoadFile(Path.Combine(dir_, assemblyName.Name)));
 			// if no exception, success
 		}
 
@@ -205,15 +205,15 @@ public void MixedSubclass()
 			AssemblyName assemblyName = new AssemblyName();
 			assemblyName.Name = "MyTestCSubclass1.dll";
 			AssemblyBuilder assemblyBuilder =
-				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
+				AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave, dir_);
 			ModuleBuilder moduleBuilder = assemblyBuilder.DefineDynamicModule(assemblyName.Name, assemblyName.Name, true);
 			assemblyBuilder.AddResourceFile("B.subclass.hbm.xml", "B1.hbm.xml");
 			assemblyBuilder.AddResourceFile("A.subclass.hbm.xml", "A1.hbm.xml");
 			assemblyBuilder.AddResourceFile("C.subclass.hbm.xml", "C1.hbm.xml");
 			assemblyBuilder.Save(assemblyName.Name);
 
 			Configuration cfg = new Configuration();
-			cfg.AddAssembly(Assembly.LoadFile(dir_ + "/" + assemblyName.Name));
+			cfg.AddAssembly(Assembly.LoadFile(Path.Combine(dir_, assemblyName.Name)));
 			// if no exception, success
 		}
 	}