Prevents null exception when either General or Advanced property are …

…missing from json configuration file. Resolve #3.
emerbrito · Dec 11, 2016 · 1d23e34 · 1d23e34
1 parent 3fa5059
commit 1d23e34
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/ILMerge.MSBuild.Task/ILMerge.MSBuild.Task/MergeTask.cs b/ILMerge.MSBuild.Task/ILMerge.MSBuild.Task/MergeTask.cs
@@ -237,24 +237,29 @@ private void SetDefaults(MergerSettings settings)
 
             if (settings == null) throw new ArgumentNullException(nameof(settings));
 
+            if(settings.General == null)
+            {
+                settings.General = new GeneralSettings();
+            }
+
             if (!settings.General.KeyFile.HasValue() && this.KeyFile.HasValue())
             {
                 settings.General.KeyFile = ToAbsolutePath(KeyFile);
                 Log.LogMessage("Applying default value for KeyFile.");
             }
-                
+
             if (!settings.General.OutputFile.HasValue())
             {
                 settings.General.OutputFile = Path.Combine(this.TargetDir, "ILMerge", this.TargetFileName);
                 Log.LogMessage("Applying default value for OutputFile.");
-            }                
+            }
 
             if (!settings.General.TargetPlatform.HasValue())
             {
                 settings.General.TargetPlatform = FrameworkInfo.ToILmergeTargetPlatform(this.TargetFrameworkVersion, this.TargetArchitecture);
                 Log.LogMessage($"Applying default value for TargetPlatform: {settings.General.TargetPlatform}");
-            }  
-            
+            }
+
             if(settings.General.InputAssemblies == null || settings.General.InputAssemblies.Count == 0)
             {
 
@@ -269,8 +274,15 @@ private void SetDefaults(MergerSettings settings)
             }
             else
             {
+                settings.General.InputAssemblies = new List<string>();
                 settings.General.InputAssemblies.Insert(0, this.TargetPath);
             }
+
+            if (settings.Advanced == null)
+            {
+                settings.Advanced = new AdvancedSettings();
+            }
+
 
         }