@@ -410,21 +410,21 @@ internal virtual void InitializeForTests(SdkResolverLoader resolverLoader = null
410410 _sdkResolverLoader = CachingSdkResolverLoader . Instance ;
411411 }
412412
413- List < SdkResolverManifest > specificResolversManifestsRegistryPlaceholder = null ;
414- List < SdkResolverManifest > generalResolversManifestsRegistryPlaceholder = null ;
413+ List < SdkResolverManifest > specificResolversManifestsRegistry = null ;
414+ List < SdkResolverManifest > generalResolversManifestsRegistry = null ;
415415 _manifestToResolvers = null ;
416416
417417 if ( resolvers != null )
418418 {
419- specificResolversManifestsRegistryPlaceholder = new List < SdkResolverManifest > ( ) ;
420- generalResolversManifestsRegistryPlaceholder = new List < SdkResolverManifest > ( ) ;
419+ specificResolversManifestsRegistry = new List < SdkResolverManifest > ( ) ;
420+ generalResolversManifestsRegistry = new List < SdkResolverManifest > ( ) ;
421421 _manifestToResolvers = new Dictionary < SdkResolverManifest , IReadOnlyList < SdkResolver > > ( ) ;
422422
423423 SdkResolverManifest sdkResolverManifest = new SdkResolverManifest ( DisplayName : "TestResolversManifest" , Path : null , ResolvableSdkRegex : null ) ;
424- generalResolversManifestsRegistryPlaceholder . Add ( sdkResolverManifest ) ;
424+ generalResolversManifestsRegistry . Add ( sdkResolverManifest ) ;
425425 _manifestToResolvers [ sdkResolverManifest ] = resolvers ;
426- _generalResolversManifestsRegistry = generalResolversManifestsRegistryPlaceholder . AsReadOnly ( ) ;
427- _specificResolversManifestsRegistry = specificResolversManifestsRegistryPlaceholder . AsReadOnly ( ) ;
426+ _generalResolversManifestsRegistry = generalResolversManifestsRegistry . AsReadOnly ( ) ;
427+ _specificResolversManifestsRegistry = specificResolversManifestsRegistry . AsReadOnly ( ) ;
428428 }
429429 }
430430
@@ -492,8 +492,8 @@ private void RegisterResolversManifests(ElementLocation location)
492492 }
493493 }
494494
495- var specificResolversManifestsRegistryPlaceholder = new List < SdkResolverManifest > ( ) ;
496- var generalResolversManifestsRegistryPlaceholder = new List < SdkResolverManifest > ( ) ;
495+ var specificResolversManifestsRegistry = new List < SdkResolverManifest > ( ) ;
496+ var generalResolversManifestsRegistry = new List < SdkResolverManifest > ( ) ;
497497
498498 // Break the list of all resolvers manifests into two parts: manifests with specific and general resolvers.
499499 // Since the collections are meant to be immutable, we have to only ever assign them when they're complete.
@@ -504,25 +504,25 @@ private void RegisterResolversManifests(ElementLocation location)
504504
505505 if ( manifest . ResolvableSdkRegex == null )
506506 {
507- generalResolversManifestsRegistryPlaceholder . Add ( manifest ) ;
507+ generalResolversManifestsRegistry . Add ( manifest ) ;
508508 }
509509 else
510510 {
511- specificResolversManifestsRegistryPlaceholder . Add ( manifest ) ;
511+ specificResolversManifestsRegistry . Add ( manifest ) ;
512512 }
513513 }
514514 if ( sdkDefaultResolversManifest != null )
515515 {
516- generalResolversManifestsRegistryPlaceholder . Add ( sdkDefaultResolversManifest ) ;
516+ generalResolversManifestsRegistry . Add ( sdkDefaultResolversManifest ) ;
517517 }
518518
519519 // Until this is set(and this is under lock), the ResolveSdkUsingResolversWithPatternsFirst will always
520520 // enter if branch leaving to this section.
521521 // Then it will wait at the lock and return after we release it since the collections we have filled them before releasing the lock.
522522 // The collections are never modified after this point.
523523 // So I've made them ReadOnly
524- _specificResolversManifestsRegistry = specificResolversManifestsRegistryPlaceholder . AsReadOnly ( ) ;
525- _generalResolversManifestsRegistry = generalResolversManifestsRegistryPlaceholder . AsReadOnly ( ) ;
524+ _specificResolversManifestsRegistry = specificResolversManifestsRegistry . AsReadOnly ( ) ;
525+ _generalResolversManifestsRegistry = generalResolversManifestsRegistry . AsReadOnly ( ) ;
526526 }
527527 }
528528
0 commit comments