@@ -738,8 +738,9 @@ internal Hashtable GetContainerRegistryMetadata(string packageName, string exact
738738 {
739739 using ( JsonDocument metadataJSONDoc = JsonDocument . Parse ( serverPkgInfo . Metadata ) )
740740 {
741- string pkgVersionString = String . Empty ;
741+ string pkgVersionString = String . Empty ;
742742 JsonElement rootDom = metadataJSONDoc . RootElement ;
743+
743744 if ( rootDom . TryGetProperty ( "ModuleVersion" , out JsonElement pkgVersionElement ) )
744745 {
745746 // module metadata will have "ModuleVersion" property
@@ -831,7 +832,7 @@ internal ContainerRegistryInfo GetMetadataProperty(JObject foundTags, string pac
831832 errRecord = null ;
832833 ContainerRegistryInfo serverPkgInfo = null ;
833834
834- var layers = foundTags [ "layers" ] ;
835+ JToken layers = foundTags [ "layers" ] ;
835836 if ( layers == null || layers [ 0 ] == null )
836837 {
837838 errRecord = new ErrorRecord (
@@ -843,7 +844,7 @@ internal ContainerRegistryInfo GetMetadataProperty(JObject foundTags, string pac
843844 return serverPkgInfo ;
844845 }
845846
846- var annotations = layers [ 0 ] [ "annotations" ] ;
847+ JToken annotations = layers [ 0 ] [ "annotations" ] ;
847848 if ( annotations == null )
848849 {
849850 errRecord = new ErrorRecord (
@@ -856,7 +857,7 @@ internal ContainerRegistryInfo GetMetadataProperty(JObject foundTags, string pac
856857 }
857858
858859 // Check for package name
859- var pkgTitleJToken = annotations [ "org.opencontainers.image.title" ] ;
860+ JToken pkgTitleJToken = annotations [ "org.opencontainers.image.title" ] ;
860861 if ( pkgTitleJToken == null )
861862 {
862863 errRecord = new ErrorRecord (
@@ -881,7 +882,7 @@ internal ContainerRegistryInfo GetMetadataProperty(JObject foundTags, string pac
881882 }
882883
883884 // Check for package metadata
884- var pkgMetadataJToken = annotations [ "metadata" ] ;
885+ JToken pkgMetadataJToken = annotations [ "metadata" ] ;
885886 if ( pkgMetadataJToken == null )
886887 {
887888 errRecord = new ErrorRecord (
@@ -896,7 +897,7 @@ internal ContainerRegistryInfo GetMetadataProperty(JObject foundTags, string pac
896897 var metadata = pkgMetadataJToken . ToString ( ) ;
897898
898899 // Check for package artifact type
899- var resourceTypeJToken = annotations [ "resourceType" ] ;
900+ JToken resourceTypeJToken = annotations [ "resourceType" ] ;
900901 var resourceType = resourceTypeJToken != null ? resourceTypeJToken . ToString ( ) : "None" ;
901902
902903 return new ContainerRegistryInfo ( metadataPkgName , metadata , resourceType ) ;
0 commit comments