Fixes issues with outputting module reference lists.

Author: MiYanni

tools/NetCorePsd1Sync/NetCorePsd1Sync/NetCoreDefinitionGenerator.cs

@@ -151,6 +151,8 @@ private static ModuleReference CreateModuleReferenceFromHashtable(Hashtable data
             };
         }
 
+        private static List<ModuleReference> CreateModuleReferenceList(Hashtable data, string key) => 
+            data.GetValueAsArrayOrDefault(key)?.OfType<Hashtable>().Select(CreateModuleReferenceFromHashtable).ToList();
 
         public static PsDefinition CreateDefinitionFromExisting(Hashtable existingDefinition, PsDefinitionHeader existingHeader)
         {
@@ -162,7 +164,6 @@ public static PsDefinition CreateDefinitionFromExisting(Hashtable existingDefini
                 var projectUri = existingPsData.GetValueAsStringOrDefault("ProjectUri");
                 var iconUri = existingPsData.GetValueAsStringOrDefault("IconUri");
                 var requireLicenseAcceptance = existingPsData.GetValueAsStringOrDefault("RequireLicenseAcceptance");
-                var externalModuleDependencies = existingDefinition.GetValueAsArray("ExternalModuleDependencies");
                 psData = new PsData
                 {
                     Tags = existingPsData.GetValueAsStringListOrDefault("Tags"),
@@ -172,13 +173,11 @@ public static PsDefinition CreateDefinitionFromExisting(Hashtable existingDefini
                     ReleaseNotes = existingPsData.GetValueAsStringOrDefault("ReleaseNotes"),
                     Prerelease = existingPsData.GetValueAsStringOrDefault("Prerelease"),
                     RequireLicenseAcceptance = String.IsNullOrEmpty(requireLicenseAcceptance) ? (bool?)null : Boolean.Parse(requireLicenseAcceptance),
-                    ExternalModuleDependencies = externalModuleDependencies.Any() ? externalModuleDependencies.Cast<Hashtable>().Select(CreateModuleReferenceFromHashtable).ToList() : null
+                    ExternalModuleDependencies = CreateModuleReferenceList(existingPsData, "ExternalModuleDependencies")
                 };
             }
 
             var processorArchitecture = existingDefinition.GetValueAsStringOrDefault("ProcessorArchitecture");
-            var requiredModules = existingDefinition.GetValueAsArray("RequiredModules");
-            var moduleList = existingDefinition.GetValueAsArray("ModuleList");
             return new PsDefinition
             {
                 ManifestHeader = existingHeader,
@@ -196,7 +195,7 @@ public static PsDefinition CreateDefinitionFromExisting(Hashtable existingDefini
                 DotNetFrameworkVersion = existingDefinition.GetValueAsVersionOrDefault("DotNetFrameworkVersion"),
                 ClrVersion = existingDefinition.GetValueAsVersionOrDefault("CLRVersion"),
                 ProcessorArchitecture = processorArchitecture != null ? Enum.Parse<ProcessorArchitecture>(processorArchitecture) : (ProcessorArchitecture?)null,
-                RequiredModules = requiredModules.Any() ? requiredModules.Cast<Hashtable>().Select(CreateModuleReferenceFromHashtable).ToList() : null,
+                RequiredModules = CreateModuleReferenceList(existingDefinition, "RequiredModules"),
                 RequiredAssemblies = existingDefinition.GetValueAsStringListOrDefault("RequiredAssemblies"),
                 ScriptsToProcess = existingDefinition.GetValueAsStringListOrDefault("ScriptsToProcess"),
                 TypesToProcess = existingDefinition.GetValueAsStringListOrDefault("TypesToProcess"),
@@ -207,7 +206,7 @@ public static PsDefinition CreateDefinitionFromExisting(Hashtable existingDefini
                 VariablesToExport = existingDefinition.GetValueAsStringListOrDefault("VariablesToExport"),
                 AliasesToExport = existingDefinition.GetValueAsStringListOrDefault("AliasesToExport"),
                 DscResourcesToExport = existingDefinition.GetValueAsStringListOrDefault("DscResourcesToExport"),
-                ModuleList = moduleList.Any() ? moduleList.Cast<Hashtable>().Select(CreateModuleReferenceFromHashtable).ToList() : null,
+                ModuleList = CreateModuleReferenceList(existingDefinition, "ModuleList"),
                 FileList = existingDefinition.GetValueAsStringListOrDefault("FileList"),
                 PrivateData = new PrivateData { PsData = psData },
                 HelpInfoUri = existingDefinition.GetValueAsStringOrDefault("HelpInfoURI"),

tools/NetCorePsd1Sync/NetCorePsd1Sync/Program.cs

@@ -51,7 +51,11 @@ public static void Main(string[] args)
             if(mode == UpdateVersion)
             {
                 var newVersion = args.FirstOrDefault(a => Version.TryParse(a, out var _));
-                _newVersion = Version.Parse(newVersion ?? "0.12.0");
+                if (newVersion == null)
+                {
+                    throw new ArgumentException($"Module update version must be provided");
+                }
+                _newVersion = Version.Parse(newVersion);
             }
             ModeMap[mode](rmPath);
         }
@@ -77,7 +81,7 @@ private static void UpdateModuleVersions(string rmPath, Version newVersion)
                 Console.WriteLine($"Updating {netCoreFilePath} to version {newVersion}");
                 var netCoreDefinition = CreateDefinitionFromExisting(netCoreHashtable, new PsDefinitionHeader { ModuleName = headerModuleName, Author = headerAuthor, Date = headerDate });
                 netCoreDefinition.ModuleVersion = newVersion;
-                if (netCoreDefinition.RequiredModules.Any(rm => rm.ModuleName == "AzureRM.Profile.Netcore"))
+                if (netCoreDefinition.RequiredModules?.Any(rm => rm.ModuleName == "AzureRM.Profile.Netcore") ?? false)
                 {
                     netCoreDefinition.RequiredModules.First(rm => rm.ModuleName == "AzureRM.Profile.Netcore").ModuleVersion = newVersion;
                 }

tools/NetCorePsd1Sync/NetCorePsd1Sync/Utility/HashtableExtensions.cs

@@ -34,7 +34,9 @@ public static Version GetValueAsVersionOrDefault(this Hashtable hashtable, strin
             return version;
         }
 
-        public static object[] GetValueAsArray(this Hashtable hashtable, string key) => hashtable[key] as object[] ?? new object[]{};
+        public static object[] GetValueAsArray(this Hashtable hashtable, string key) => GetValueAsArrayOrDefault(hashtable, key) ?? new object[]{};
+
+        public static object[] GetValueAsArrayOrDefault(this Hashtable hashtable, string key) => hashtable[key] as object[];
 
         public static Hashtable GetValueAsHashtable(this Hashtable hashtable, string key) => hashtable[key] as Hashtable ?? new Hashtable();
 
@@ -46,8 +48,7 @@ public static List<string> GetValueAsStringListOrDefault(this Hashtable hashtabl
             {
                 return new List<string> { stringValue };
             }
-            var stringList = hashtable.GetValueAsArray(key).OfType<string>().ToList();
-            return stringList.Any() ? stringList : null;
+            return hashtable.GetValueAsArrayOrDefault(key)?.OfType<string>().ToList();
         }
 
         public static bool Any(this Hashtable hashtable) => hashtable.Count > 0;