Fix upgrading old projects from notification aerav2.10.1.2

* Minor code tweeks
* Fixed saving the UpdateProjectFormat value

Change-Id: I16fecc537233f69cf4dfd4da682f38c7f31e483a
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
(cherry picked from commit d2d2cc6e8022e43c041113ab482b8703ac2c675a)

2 files changed, 11 insertions, 16 deletions

diff --git a/QtVsTools.Package/Options/QtOptionsPage.cs b/QtVsTools.Package/Options/QtOptionsPage.cs
index 3b27525f..147b8d42 100644
--- a/QtVsTools.Package/Options/QtOptionsPage.cs
+++ b/QtVsTools.Package/Options/QtOptionsPage.cs
@@ -353,7 +353,7 @@ namespace QtVsTools.Options
                     Save(BuildDebugInformation, key, BkgBuild.DebugInfo);
                     Save(BuildLoggerVerbosity, key, BkgBuild.LoggerVerbosity);
                     Save(NotifyInstalled, key, Notifications.Installed);
-                    Save(NotifyInstalled, key, Notifications.UpdateProjectFormat);
+                    Save(UpdateProjectFormat, key, Notifications.UpdateProjectFormat);
                     Save(LinkNatvis, key, Natvis.Link);
                 }
             } catch (Exception exception) {
diff --git a/QtVsTools.Package/Package/QtMsBuildConverter.cs b/QtVsTools.Package/Package/QtMsBuildConverter.cs
index 6406c6db..319e5635 100644
--- a/QtVsTools.Package/Package/QtMsBuildConverter.cs
+++ b/QtVsTools.Package/Package/QtMsBuildConverter.cs
@@ -47,21 +47,17 @@ namespace QtVsTools
         {
             ThreadHelper.ThrowIfNotOnUIThread();
 
-            var solution = QtVsToolsPackage.Instance.Dte.Solution;
-            if (solution == null)
-                return ErrorMessage(string.Format(SR.GetString("ErrorConvertingProject"), ""));
-
-            List<EnvDTE.Project> projects = new List<EnvDTE.Project>();
-            var allProjects = solution.Projects;
+            var allProjects = HelperFunctions.ProjectsInSolution(QtVsToolsPackage.Instance.Dte);
             if (allProjects.Count == 0)
                 return WarningMessage(SR.GetString("NoProjectsToConvert"));
 
-            foreach (EnvDTE.Project project in allProjects) {
-                if ((HelperFunctions.IsVsToolsProject(project)
-                    || HelperFunctions.IsQtProject(project))
-                    && !QtProject.IsQtMsBuildEnabled(project)) {
-                    projects.Add(project);
+            var projects = new List<EnvDTE.Project>();
+            foreach (var project in allProjects.Where(HelperFunctions.IsQtProject)) {
+                if (QtProject.IsQtMsBuildEnabled(project)) {
+                    if (QtProject.GetFormatVersion(project) >= Resources.qtProjectFormatVersion)
+                        continue;
                 }
+                projects.Add(project);
             }
             if (projects.Count == 0)
                 return WarningMessage(SR.GetString("NoProjectsToConvert"));
@@ -95,6 +91,7 @@ namespace QtVsTools
                 })
                 .ToList();
 
+            var solution = QtVsToolsPackage.Instance.Dte.Solution;
             string solutionPath = solution.FileName;
             solution.Close(true);
 
@@ -116,8 +113,7 @@ namespace QtVsTools
                     }
                 }
                 if (!ConvertProject(projectPath)) {
-                    if (waitDialog != null)
-                        waitDialog.Stop();
+                    waitDialog?.Stop();
                     QtVsToolsPackage.Instance.Dte.Solution.Open(solutionPath);
                     return ErrorMessage(string.Format(SR.GetString("ErrorConvertingProject"),
                         Path.GetFileName(projectPath)));
@@ -125,8 +121,7 @@ namespace QtVsTools
                 ++projCount;
             }
 
-            if (waitDialog != null)
-                waitDialog.Stop();
+            waitDialog?.Stop();
 
             QtVsToolsPackage.Instance.Dte.Solution.Open(solutionPath);
             if (canceled && projCount < projectPaths.Count) {