From a53ecbf235de372da126a939dbcd0fee983caafc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?=
 <12201973+fredericDelaporte@users.noreply.github.com>
Date: Thu, 21 Jun 2018 13:39:09 +0200
Subject: [PATCH 1/3] Fix configuration schema forbidding custom bytecode
 provider

---
 .../CfgTest/ConfigurationSchemaFixture.cs       | 17 +++++++++++++++++
 src/NHibernate/nhibernate-configuration.xsd     | 15 +++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs b/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs
index f47b851ab70..02f287405e7 100644
--- a/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs
+++ b/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs
@@ -35,6 +35,23 @@ public void FromAppConfigTest()
 			Assert.IsTrue(hc.UseReflectionOptimizer);
 			Assert.AreEqual("NHibernate.Test", hc.SessionFactory.Name);
 		}
+ 
+		[Test]
+		public void ByteCodeProvider()
+		{
+			Assume.That(TestsContext.ExecutingWithVsTest, Is.False);
+
+			var xml =
+				@"<?xml version='1.0' encoding='utf-8' ?>
+<hibernate-configuration xmlns='urn:nhibernate-configuration-2.2'>
+	<bytecode-provider type='test'/>
+	<session-factory>
+	</session-factory>
+</hibernate-configuration>";
+
+			var hc = HibernateConfiguration.FromAppConfig(xml);
+			Assert.That(hc.ByteCodeProviderType, Is.EqualTo("test"));
+		}
 
 		[Test]
 		public void IgnoreSystemOutOfAppConfig()
diff --git a/src/NHibernate/nhibernate-configuration.xsd b/src/NHibernate/nhibernate-configuration.xsd
index c3b9d1d0fdf..e9096306180 100644
--- a/src/NHibernate/nhibernate-configuration.xsd
+++ b/src/NHibernate/nhibernate-configuration.xsd
@@ -326,10 +326,17 @@
 			</xs:sequence>
 			<xs:attribute name="type" default="lcg">
 				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="lcg" />
-						<xs:enumeration value="null" />
-					</xs:restriction>
+					<xs:union>
+						<xs:simpleType>
+							<xs:restriction base="xs:string">
+								<xs:enumeration value="lcg" />
+								<xs:enumeration value="null" />
+							</xs:restriction>
+						</xs:simpleType>
+						<xs:simpleType>
+							<xs:restriction base="xs:string" />
+						</xs:simpleType>
+					</xs:union>
 				</xs:simpleType>
 			</xs:attribute>
 		</xs:complexType>

From d063a3fc4bc5096d56f074dae1e062ec346ccd65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?=
 <12201973+fredericDelaporte@users.noreply.github.com>
Date: Thu, 21 Jun 2018 23:51:23 +0200
Subject: [PATCH 2/3] Rename a test bu the way

To be squashed.
---
 src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs b/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs
index 02f287405e7..98c522f4405 100644
--- a/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs
+++ b/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Configuration;
-using System.Reflection;
 using NHibernate.Event;
 using NUnit.Framework;
 using NHibernate.Cfg;
@@ -13,7 +11,7 @@ namespace NHibernate.Test.CfgTest
 	public class ConfigurationSchemaFixture
 	{
 		[Test]
-		public void InvalidConfig()
+		public void ThrowIfSessionFactoryIsMissing()
 		{
 			string xml =
 			@"<?xml version='1.0' encoding='utf-8' ?>
@@ -22,7 +20,7 @@ public void InvalidConfig()
 </hibernate-configuration>";
 
 			XmlTextReader xtr = new XmlTextReader(xml, XmlNodeType.Document, null);
-			Assert.Throws<HibernateConfigException>(()=>new HibernateConfiguration(xtr));
+			Assert.Throws<HibernateConfigException>(() => new HibernateConfiguration(xtr));
 		}
 
 		[Test]

From b41e01423f9f86ed1a798b8c0aea0cc9d3d838e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Delaporte?=
 <12201973+fredericDelaporte@users.noreply.github.com>
Date: Fri, 22 Jun 2018 13:18:40 +0200
Subject: [PATCH 3/3] Re-rename a test

To be squashed.
---
 src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs b/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs
index 98c522f4405..41ff72660fd 100644
--- a/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs
+++ b/src/NHibernate.Test/CfgTest/ConfigurationSchemaFixture.cs
@@ -11,7 +11,7 @@ namespace NHibernate.Test.CfgTest
 	public class ConfigurationSchemaFixture
 	{
 		[Test]
-		public void ThrowIfSessionFactoryIsMissing()
+		public void SessionFactoryIsRequiredWhenConfigurationIsNotLoadedFromAppConfig()
 		{
 			string xml =
 			@"<?xml version='1.0' encoding='utf-8' ?>