@@ -267,7 +267,7 @@ private Assembly Resolve(AssemblyLoadContext loadContext, AssemblyName assemblyN
267267 {
268268#if ! UNIX
269269 //Try loading from GAC
270- if ( ! TryFindInGAC ( assemblyName , out asmFilePath ) )
270+ if ( ! TryFindInGAC ( assemblyName , out asmFilePath ) )
271271 {
272272 return null ;
273273 }
@@ -295,53 +295,55 @@ private Assembly Resolve(AssemblyLoadContext loadContext, AssemblyName assemblyN
295295 // If there are multiple version of the assembly, load the latest.
296296 private bool TryFindInGAC ( AssemblyName assemblyName , out string assemblyFilePath )
297297 {
298- bool assemblyFound = false ;
299298 assemblyFilePath = null ;
299+ if ( Internal . InternalTestHooks . DisableGACLoading )
300+ {
301+ return false ;
302+ }
303+
304+ bool assemblyFound = false ;
300305 char dirSeparator = IO . Path . DirectorySeparatorChar ;
301306
302- if ( PowerShellAssemblyLoadContextTestHooks . AllowGACLoading )
307+ if ( String . IsNullOrEmpty ( _winDir ) )
303308 {
304- if ( String . IsNullOrEmpty ( _winDir ) )
305- {
306- //cache value of '_winDir' folder in member variable.
307- _winDir = Environment . GetEnvironmentVariable ( "winDir" ) ;
308- }
309+ //cache value of '_winDir' folder in member variable.
310+ _winDir = Environment . GetEnvironmentVariable ( "winDir" ) ;
311+ }
309312
310- if ( String . IsNullOrEmpty ( _gacPathMSIL ) )
311- {
312- //cache value of '_gacPathMSIL' folder in member variable.
313- _gacPathMSIL = $ "{ _winDir } { dirSeparator } Microsoft.NET{ dirSeparator } assembly{ dirSeparator } GAC_MSIL";
314- }
313+ if ( String . IsNullOrEmpty ( _gacPathMSIL ) )
314+ {
315+ //cache value of '_gacPathMSIL' folder in member variable.
316+ _gacPathMSIL = $ "{ _winDir } { dirSeparator } Microsoft.NET{ dirSeparator } assembly{ dirSeparator } GAC_MSIL";
317+ }
315318
316- assemblyFound = FindInGac ( _gacPathMSIL , assemblyName , out assemblyFilePath ) ;
319+ assemblyFound = FindInGac ( _gacPathMSIL , assemblyName , out assemblyFilePath ) ;
317320
318- if ( ! assemblyFound )
319- {
320- string gacBitnessAwarePath = null ;
321+ if ( ! assemblyFound )
322+ {
323+ string gacBitnessAwarePath = null ;
321324
322- if ( Environment . Is64BitProcess )
325+ if ( Environment . Is64BitProcess )
326+ {
327+ if ( String . IsNullOrEmpty ( _gacPath64 ) )
323328 {
324- if ( String . IsNullOrEmpty ( _gacPath64 ) )
325- {
326- //cache value of '_gacPath64' folder in member variable.
327- _gacPath64 = $ "{ _winDir } { dirSeparator } Microsoft.NET{ dirSeparator } assembly{ dirSeparator } GAC_64";
328- }
329-
330- gacBitnessAwarePath = _gacPath64 ;
329+ //cache value of '_gacPath64' folder in member variable.
330+ _gacPath64 = $ "{ _winDir } { dirSeparator } Microsoft.NET{ dirSeparator } assembly{ dirSeparator } GAC_64";
331331 }
332- else
333- {
334- if ( String . IsNullOrEmpty ( _gacPath32 ) )
335- {
336- //cache value of '_gacPath32' folder in member variable.
337- _gacPath32 = $ "{ _winDir } { dirSeparator } Microsoft.NET{ dirSeparator } assembly{ dirSeparator } GAC_32";
338- }
339332
340- gacBitnessAwarePath = _gacPath32 ;
333+ gacBitnessAwarePath = _gacPath64 ;
334+ }
335+ else
336+ {
337+ if ( String . IsNullOrEmpty ( _gacPath32 ) )
338+ {
339+ //cache value of '_gacPath32' folder in member variable.
340+ _gacPath32 = $ "{ _winDir } { dirSeparator } Microsoft.NET{ dirSeparator } assembly{ dirSeparator } GAC_32";
341341 }
342342
343- assemblyFound = FindInGac ( gacBitnessAwarePath , assemblyName , out assemblyFilePath ) ;
343+ gacBitnessAwarePath = _gacPath32 ;
344344 }
345+
346+ assemblyFound = FindInGac ( gacBitnessAwarePath , assemblyName , out assemblyFilePath ) ;
345347 }
346348
347349 return assemblyFound ;
@@ -356,17 +358,17 @@ private bool FindInGac(string gacRoot, AssemblyName assemblyName, out string ass
356358 char dirSeparator = IO . Path . DirectorySeparatorChar ;
357359 string tempAssemblyDirPath = $ "{ gacRoot } { dirSeparator } { assemblyName . Name } ";
358360
359- if ( Directory . Exists ( tempAssemblyDirPath ) )
361+ if ( Directory . Exists ( tempAssemblyDirPath ) )
360362 {
361363 //Enumerate all directories, sort by name and select the last. This selects the latest version.
362364 var chosenVersionDirectory = Directory . GetDirectories ( tempAssemblyDirPath ) . OrderBy ( d => d ) . LastOrDefault ( ) ;
363365
364- if ( ! String . IsNullOrEmpty ( chosenVersionDirectory ) )
366+ if ( ! String . IsNullOrEmpty ( chosenVersionDirectory ) )
365367 {
366368 //Select first or default as the directory will contain only one assembly. If nothing then default is null;
367369 var foundAssemblyPath = Directory . GetFiles ( chosenVersionDirectory , $ "{ assemblyName . Name } *") . FirstOrDefault ( ) ;
368370
369- if ( ! String . IsNullOrEmpty ( foundAssemblyPath ) )
371+ if ( ! String . IsNullOrEmpty ( foundAssemblyPath ) )
370372 {
371373 AssemblyName asmNameFound = AssemblyLoadContext . GetAssemblyName ( foundAssemblyPath ) ;
372374 if ( IsAssemblyMatching ( assemblyName , asmNameFound ) )
@@ -515,24 +517,6 @@ public static void SetPowerShellAssemblyLoadContext([MarshalAs(UnmanagedType.LPW
515517 PowerShellAssemblyLoadContext . InitializeSingleton ( basePaths ) ;
516518 }
517519 }
518-
519- /// <summary>
520- /// Test hooks for PowershellAssemblyLoadContext
521- /// </summary>
522- public static class PowerShellAssemblyLoadContextTestHooks
523- {
524- internal static bool AllowGACLoading = true ;
525-
526- /// <summary>This member is used for internal test purposes.</summary>
527- public static void SetTestHook ( string property , bool value )
528- {
529- var fieldInfo = typeof ( PowerShellAssemblyLoadContextTestHooks ) . GetField ( property , BindingFlags . Static | BindingFlags . NonPublic ) ;
530- if ( fieldInfo != null )
531- {
532- fieldInfo . SetValue ( null , value ) ;
533- }
534- }
535- }
536520}
537521
538522#endif
0 commit comments