Commite7edeab

dse

committed

Assembly loading experience improved + fixes.

1 parent9304d72 commite7edeabCopy full SHA for e7edeab

File tree

+14

-3

lines changed

+14

-3

lines changed

Lines changed: 14 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,10 @@ public static Assembly LoadAssembly(string name)`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`PythonEngine.RaiseAssemblyAsModuleImportingEvent(importEvent);`
`206`		`-`
`207`		`-assembly=Assembly.Load(name);`
	`206`	`+if(!importEvent.SkipAssemblyLoad)`
	`207`	`+{`
	`208`	`+assembly=Assembly.Load(name);`
	`209`	`+}`
`208`	`210`	`}`
`209`	`211`	`catch(Exception)`
`210`	`212`	`{`
`@@ -351,8 +353,17 @@ internal static void ScanAssembly(Assembly assembly)`
`351`	`353`	`// A couple of things we want to do here: first, we want to`
`352`	`354`	`// gather a list of all of the namespaces contributed to by`
`353`	`355`	`// the assembly.`
	`356`	`+Type[]types=newType[0];`
	`357`	`+try`
	`358`	`+{`
	`359`	`+types=assembly.IsDynamic?assembly.GetTypes():assembly.GetExportedTypes();`
	`360`	`+}`
	`361`	`+catch(TypeLoadException)`
	`362`	`+{`
	`363`	`+// Do nothing.`
	`364`	`+// This problem usually occurs when transitive dependencies have references to older packages than main application.`
	`365`	`+}`
`354`	`366`
`355`		`-Type[]types=assembly.GetTypes();`
`356`	`367`	`foreach(Typetintypes)`
`357`	`368`	`{`
`358`	`369`	`stringns=t.Namespace??"";`

Comments

(0)