diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2023-01-09 14:22:49 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2023-01-09 18:56:10 +0000 |
| commit | d2d2cc6e8022e43c041113ab482b8703ac2c675a (patch) | |
| tree | 4331b01ae5325c5849c0494230d985825c2271b9 | |
| parent | 31ce1927c748afe676ea2eaca5a6e3e8e5152c7a (diff) | |
Fix upgrading old projects from notification aerav2.10.1
* Minor code tweeks
* Fixed saving the UpdateProjectFormat value
Change-Id: I16fecc537233f69cf4dfd4da682f38c7f31e483a
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
| -rw-r--r-- | QtVsTools.Package/Options/QtOptionsPage.cs | 2 | ||||
| -rw-r--r-- | QtVsTools.Package/Package/QtMsBuildConverter.cs | 25 |
2 files changed, 11 insertions, 16 deletions
diff --git a/QtVsTools.Package/Options/QtOptionsPage.cs b/QtVsTools.Package/Options/QtOptionsPage.cs index 3360219b..82a1d20c 100644 --- a/QtVsTools.Package/Options/QtOptionsPage.cs +++ b/QtVsTools.Package/Options/QtOptionsPage.cs @@ -347,7 +347,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) { |