Merge pull request #1765 from sibille/dev

Ensure config is not null in version checks
microsoft · Jan 29, 2018 · 7ad5905 · 7ad5905
2 parents 043ee49 + c3245fa
commit 7ad5905
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/code/src/Core/Locations/TemplatesContent.cs b/code/src/Core/Locations/TemplatesContent.cs
@@ -71,7 +71,7 @@ public bool IsNewVersionAvailable(out Version version)
             version = null;
             if (Current != null)
             {
-                var result = !Current.Version.IsNull() && Current.Version < Source.Config.ResolvePackage(WizardVersion)?.Version;
+                var result = !Current.Version.IsNull() && Current.Version < Source.Config?.ResolvePackage(WizardVersion)?.Version;
                 if (result == true)
                 {
                     version = Source.Config.ResolvePackage(WizardVersion)?.Version;
@@ -91,7 +91,7 @@ public bool IsWizardUpdateAvailable(out Version version)
 
             if (Current != null)
             {
-                var result = !Current.Version.IsNull() && (Current.Version.Major < Source.Config.Latest.Version.Major || Current.Version.Minor < Source.Config.Latest.Version.Minor);
+                var result = !Current.Version.IsNull() && (Current.Version.Major < Source.Config?.Latest.Version.Major || Current.Version.Minor < Source.Config?.Latest.Version.Minor);
                 if (result == true)
                 {
                     version = new Version(Source.Config.Latest.Version.Major, Source.Config.Latest.Version.Minor);