NH-3807 - Add AssemblyName to Assembly.Load

ngbrown · ngbrown · commit fb844c89d8b3 · 2016-08-21T14:47:53.000-07:00
diff --git a/src/NHibernate.Test/CfgTest/ConfigurationSerializationTests.cs b/src/NHibernate.Test/CfgTest/ConfigurationSerializationTests.cs
@@ -22,7 +22,7 @@ public void Configuration_should_be_serializable()
 		[Test]
 		public void Basic_CRUD_should_work()
 		{
-			Assembly assembly = Assembly.Load("NHibernate.DomainModel");
+			Assembly assembly = Assembly.Load(new AssemblyName("NHibernate.DomainModel"));
 			var cfg = new Configuration();
 			if (TestConfigurationHelper.hibernateConfigFile != null)
 			{
diff --git a/src/NHibernate.Test/Linq/LinqReadonlyTestsContext.cs b/src/NHibernate.Test/Linq/LinqReadonlyTestsContext.cs
@@ -114,7 +114,7 @@ private Configuration Configure()
 
 			configuration.SetProperty(Environment.ConnectionProvider, typeof (DriverConnectionProvider).AssemblyQualifiedName);
 
-			Assembly assembly = Assembly.Load(MappingsAssembly);
+			Assembly assembly = Assembly.Load(new AssemblyName(MappingsAssembly));
 
 			foreach (string file in Mappings.Select(mf => MappingsAssembly + "." + mf))
 			{
@@ -143,4 +143,4 @@ private void CreateTestData(ISessionFactory sessionFactory)
 			}
 		}
 	}
-}
+}
diff --git a/src/NHibernate.Test/NHSpecificTest/DtcFailures/DtcFailuresFixture.cs b/src/NHibernate.Test/NHSpecificTest/DtcFailures/DtcFailuresFixture.cs
@@ -45,7 +45,7 @@ protected override void CreateSchema()
             config.BeforeBindMapping += BeforeBindMapping;
 
             // Copied from AddMappings methods.
-			Assembly assembly = Assembly.Load(MappingsAssembly);
+			Assembly assembly = Assembly.Load(new AssemblyName(MappingsAssembly));
 			foreach (string file in Mappings)
 				config.AddResource(MappingsAssembly + "." + file, assembly);
 
@@ -353,4 +353,4 @@ public void InDoubt(Enlistment enlistment)
 			}
 		}
 	}
-}
+}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/NH1274ExportExcludeFixture.cs b/src/NHibernate.Test/NHSpecificTest/NH1274ExportExclude/NH1274ExportExcludeFixture.cs
@@ -98,7 +98,7 @@ private Configuration GetConfiguration()
 			if (TestConfigurationHelper.hibernateConfigFile != null)
 				cfg.Configure(TestConfigurationHelper.hibernateConfigFile);
 
-			Assembly assembly = Assembly.Load(MappingsAssembly);
+			Assembly assembly = Assembly.Load(new AssemblyName(MappingsAssembly));
 
 			foreach (string file in Mappings)
 			{
@@ -133,4 +133,4 @@ protected IList Mappings
 			}
 		}
 	}
-}
+}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH2297/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2297/Fixture.cs
@@ -28,7 +28,7 @@ public void InvalidCustomCompositeUserTypeThrowsMeaningfulException(string mappi
 
 			const string MappingsAssembly = "NHibernate.Test";
 
-			Assembly assembly = Assembly.Load(MappingsAssembly);
+			Assembly assembly = Assembly.Load(new AssemblyName(MappingsAssembly));
 
 			string ns = GetType().Namespace;
 			string bugNumber = ns.Substring(ns.LastIndexOf('.') + 1);
diff --git a/src/NHibernate.Test/NHSpecificTest/NH2484/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH2484/Fixture.cs
@@ -20,7 +20,7 @@ protected override bool AppliesTo(NHibernate.Dialect.Dialect dialect)
 		[Test]
 		public void TestPersistenceOfClassWithUnknownSerializableType()
 		{
-			Assembly assembly = Assembly.Load(MappingsAssembly);
+			Assembly assembly = Assembly.Load(new AssemblyName(MappingsAssembly));
 			var stream = assembly.GetManifestResourceStream("NHibernate.Test.NHSpecificTest.NH2484.food-photo.jpg");
 			var image = Bitmap.FromStream(stream);
 			
@@ -52,7 +52,7 @@ public void TestPersistenceOfClassWithUnknownSerializableType()
 		[Test]
 		public void TestPersistenceOfClassWithSerializableType()
 		{
-			Assembly assembly = Assembly.Load(MappingsAssembly);
+			Assembly assembly = Assembly.Load(new AssemblyName(MappingsAssembly));
 			var stream = assembly.GetManifestResourceStream("NHibernate.Test.NHSpecificTest.NH2484.food-photo.jpg");
 			var image = Bitmap.FromStream(stream);
 			
diff --git a/src/NHibernate.Test/NHSpecificTest/NH3121/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3121/Fixture.cs
@@ -53,7 +53,7 @@ public void ShouldThrowWhenByteArrayTooLong()
 		[Test]
 		public void ShouldThrowWhenImageTooLarge()
 		{
-			Assembly assembly = Assembly.Load(MappingsAssembly);
+			Assembly assembly = Assembly.Load(new AssemblyName(MappingsAssembly));
 			var stream = assembly.GetManifestResourceStream("NHibernate.Test.NHSpecificTest.NH2484.food-photo.jpg");
 			var image = Bitmap.FromStream(stream);
 
@@ -72,7 +72,7 @@ public void ShouldThrowWhenImageTooLarge()
 		[Test]
 		public void ShouldThrowWhenImageAsISerializableTooLarge()
 		{
-			Assembly assembly = Assembly.Load(MappingsAssembly);
+			Assembly assembly = Assembly.Load(new AssemblyName(MappingsAssembly));
 			var stream = assembly.GetManifestResourceStream("NHibernate.Test.NHSpecificTest.NH2484.food-photo.jpg");
 			var image = Bitmap.FromStream(stream);
 
diff --git a/src/NHibernate.Test/TestCase.cs b/src/NHibernate.Test/TestCase.cs
@@ -231,7 +231,7 @@ private void Configure()
 
 		protected virtual void AddMappings(Configuration configuration)
 		{
-			Assembly assembly = Assembly.Load(MappingsAssembly);
+			Assembly assembly = Assembly.Load(new AssemblyName(MappingsAssembly));
 
 			foreach (string file in Mappings)
 			{
diff --git a/src/NHibernate/AdoNet/MySqlClientSqlCommandSet.cs b/src/NHibernate/AdoNet/MySqlClientSqlCommandSet.cs
@@ -20,7 +20,7 @@ public class MySqlClientSqlCommandSet : IDisposable
 
 		static MySqlClientSqlCommandSet()
 		{
-			var sysData = Assembly.Load("MySql.Data");
+			var sysData = Assembly.Load(new AssemblyName("MySql.Data"));
 			adapterType = sysData.GetType("MySql.Data.MySqlClient.MySqlDataAdapter");
 			Debug.Assert(adapterType != null, "Could not find MySqlDataAdapter!");
 
@@ -71,4 +71,4 @@ public int CountOfCommands
 			get { return countOfCommands; }
 		}
 	}
-}
+}
diff --git a/src/NHibernate/AdoNet/SqlClientSqlCommandSet.cs b/src/NHibernate/AdoNet/SqlClientSqlCommandSet.cs
@@ -32,7 +32,7 @@ public class SqlClientSqlCommandSet : IDisposable
 
 		static SqlClientSqlCommandSet()
 		{
-			var sysData = Assembly.Load("System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");
+			var sysData = Assembly.Load(new AssemblyName("System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));
 			sqlCmdSetType = sysData.GetType("System.Data.SqlClient.SqlCommandSet");
 			Debug.Assert(sqlCmdSetType != null, "Could not find SqlCommandSet!");
 
diff --git a/src/NHibernate/Cfg/Configuration.cs b/src/NHibernate/Cfg/Configuration.cs
@@ -750,7 +750,7 @@ public Configuration AddAssembly(string assemblyName)
 			Assembly assembly = null;
 			try
 			{
-				assembly = Assembly.Load(assemblyName);
+				assembly = Assembly.Load(new AssemblyName(assemblyName));
 			}
 			catch (Exception e)
 			{
@@ -1574,7 +1574,7 @@ protected Configuration DoConfigure(ISessionFactoryConfiguration factoryConfigur
 				if (!string.IsNullOrEmpty(mc.Resource) && !string.IsNullOrEmpty(mc.Assembly))
 				{
 					log.Debug(factoryConfiguration.Name + "<-" + mc.Resource + " in " + mc.Assembly);
-					AddResource(mc.Resource, Assembly.Load(mc.Assembly));
+					AddResource(mc.Resource, Assembly.Load(new AssemblyName(mc.Assembly)));
 				}
 				else if (!string.IsNullOrEmpty(mc.Assembly))
 				{
diff --git a/src/NHibernate/Util/ReflectHelper.cs b/src/NHibernate/Util/ReflectHelper.cs
@@ -274,7 +274,7 @@ public static System.Type TypeFromAssembly(AssemblyQualifiedTypeName name, bool
 					return null;
 				}
 
-				Assembly assembly = Assembly.Load(name.Assembly);
+				Assembly assembly = Assembly.Load(new AssemblyName(name.Assembly));
 
 				if (assembly == null)
 				{
@@ -311,7 +311,7 @@ public static bool TryLoadAssembly(string assemblyName)
 			bool result = true;
 			try
 			{
-				Assembly.Load(assemblyName);
+				Assembly.Load(new AssemblyName(assemblyName));
 			}
 			catch (Exception)
 			{

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public void Configuration_should_be_serializable()`
`22`	`22`	`[Test]`
`23`	`23`	`public void Basic_CRUD_should_work()`
`24`	`24`	`{`
`25`		`- Assembly assembly = Assembly.Load("NHibernate.DomainModel");`
	`25`	`+ Assembly assembly = Assembly.Load(new AssemblyName("NHibernate.DomainModel"));`
`26`	`26`	`var cfg = new Configuration();`
`27`	`27`	`if (TestConfigurationHelper.hibernateConfigFile != null)`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ private Configuration Configure()`
`114`	`114`
`115`	`115`	`configuration.SetProperty(Environment.ConnectionProvider, typeof (DriverConnectionProvider).AssemblyQualifiedName);`
`116`	`116`
`117`		`- Assembly assembly = Assembly.Load(MappingsAssembly);`
	`117`	`+ Assembly assembly = Assembly.Load(new AssemblyName(MappingsAssembly));`
`118`	`118`
`119`	`119`	`foreach (string file in Mappings.Select(mf => MappingsAssembly + "." + mf))`
`120`	`120`	`{`
`@@ -143,4 +143,4 @@ private void CreateTestData(ISessionFactory sessionFactory)`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`	`}`
`146`		`-}`
	`146`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected override void CreateSchema()`
`45`	`45`	`config.BeforeBindMapping += BeforeBindMapping;`
`46`	`46`
`47`	`47`	`// Copied from AddMappings methods.`
`48`		`- Assembly assembly = Assembly.Load(MappingsAssembly);`
	`48`	`+ Assembly assembly = Assembly.Load(new AssemblyName(MappingsAssembly));`
`49`	`49`	`foreach (string file in Mappings)`
`50`	`50`	`config.AddResource(MappingsAssembly + "." + file, assembly);`
`51`	`51`
`@@ -353,4 +353,4 @@ public void InDoubt(Enlistment enlistment)`
`353`	`353`	`}`
`354`	`354`	`}`
`355`	`355`	`}`
`356`		`-}`
	`356`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ private Configuration GetConfiguration()`
`98`	`98`	`if (TestConfigurationHelper.hibernateConfigFile != null)`
`99`	`99`	`cfg.Configure(TestConfigurationHelper.hibernateConfigFile);`
`100`	`100`
`101`		`- Assembly assembly = Assembly.Load(MappingsAssembly);`
	`101`	`+ Assembly assembly = Assembly.Load(new AssemblyName(MappingsAssembly));`
`102`	`102`
`103`	`103`	`foreach (string file in Mappings)`
`104`	`104`	`{`
`@@ -133,4 +133,4 @@ protected IList Mappings`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`	`}`
`136`		`-}`
	`136`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ private void Configure()`
`231`	`231`
`232`	`232`	`protected virtual void AddMappings(Configuration configuration)`
`233`	`233`	`{`
`234`		`- Assembly assembly = Assembly.Load(MappingsAssembly);`
	`234`	`+ Assembly assembly = Assembly.Load(new AssemblyName(MappingsAssembly));`
`235`	`235`
`236`	`236`	`foreach (string file in Mappings)`
`237`	`237`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public class MySqlClientSqlCommandSet : IDisposable`
`20`	`20`
`21`	`21`	`static MySqlClientSqlCommandSet()`
`22`	`22`	`{`
`23`		`- var sysData = Assembly.Load("MySql.Data");`
	`23`	`+ var sysData = Assembly.Load(new AssemblyName("MySql.Data"));`
`24`	`24`	`adapterType = sysData.GetType("MySql.Data.MySqlClient.MySqlDataAdapter");`
`25`	`25`	`Debug.Assert(adapterType != null, "Could not find MySqlDataAdapter!");`
`26`	`26`
`@@ -71,4 +71,4 @@ public int CountOfCommands`
`71`	`71`	`get { return countOfCommands; }`
`72`	`72`	`}`
`73`	`73`	`}`
`74`		`-}`
	`74`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public class SqlClientSqlCommandSet : IDisposable`
`32`	`32`
`33`	`33`	`static SqlClientSqlCommandSet()`
`34`	`34`	`{`
`35`		`- var sysData = Assembly.Load("System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089");`
	`35`	`+ var sysData = Assembly.Load(new AssemblyName("System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"));`
`36`	`36`	`sqlCmdSetType = sysData.GetType("System.Data.SqlClient.SqlCommandSet");`
`37`	`37`	`Debug.Assert(sqlCmdSetType != null, "Could not find SqlCommandSet!");`
`38`	`38`