diff options
Diffstat (limited to 'version.tt')
| -rw-r--r-- | version.tt | 62 |
1 files changed, 27 insertions, 35 deletions
@@ -38,44 +38,36 @@ ** ****************************************************************************/ - Func<string> GetRevisionData = new Func<string>(() => - { - var proc = System.Diagnostics.Process.Start(new ProcessStartInfo - { - FileName = "git", - Arguments = "describe --tags", - WorkingDirectory = Directory.GetParent(SolutionDir).FullName, - CreateNoWindow = true, UseShellExecute = false, - RedirectStandardOutput = true, RedirectStandardError = true, - }); - return proc.WaitForExit(3000) && proc.ExitCode == 0 ? proc.StandardOutput.ReadLine() : ""; - }); - string REVISION_TAG = GetRevisionData(); - int REVISION_NUMBER = Convert.ToInt32(REVISION_TAG.Split('-').Skip(1).FirstOrDefault()); + Version v; + try { + var versionText = File + .ReadAllText(Path.Combine(SolutionDir, "version.log")) + .Replace("\r\n", "") + .Trim(); + v = new Version(versionText); + } catch (Exception) { + Error("Error reading extension version"); + v = new Version("0.0.0.0"); + } -/***************************************************************************/ + string QT_VS_TOOLS_VERSION = $"{v.Major}.{v.Minor}.{v.Build}"; - string QT_VS_TOOLS_VERSION = (string)XDocument.Load(SolutionDir + @"\version.targets") - .Descendants() - .Where(x => x.Name.LocalName == "QtVSToolsVersion") - .FirstOrDefault(); + string QT_VS_TOOLS_VERSION_TAG = $"{v.Major}{v.Minor}{v.Build}"; -/***************************************************************************/ + string QT_VS_TOOLS_VERSION_ASSEMBLY = + (v.Revision == -1) + ? $"{v.Major}.{v.Minor}.{v.Build}.0" + : $"{v.Major}.{v.Minor}.{v.Build}.{v.Revision}"; - string QT_VS_TOOLS_VERSION_TAG - = QT_VS_TOOLS_VERSION.Replace(".", ""); + string QT_VS_TOOLS_VERSION_ASSEMBLY_FILE = QT_VS_TOOLS_VERSION_ASSEMBLY; - string QT_VS_TOOLS_VERSION_ASSEMBLY - = string.Format("{0}.{1}", QT_VS_TOOLS_VERSION, REVISION_NUMBER); + string QT_VS_TOOLS_VERSION_USER = + (v.Revision <= 0) + ? $"{v.Major}.{v.Minor}.{v.Build}" + : $"{v.Major}.{v.Minor}.{v.Build} (rev.{v.Revision})"; - string QT_VS_TOOLS_VERSION_ASSEMBLY_FILE - = string.Format("{0}.{1}", QT_VS_TOOLS_VERSION, REVISION_NUMBER); - - string QT_VS_TOOLS_VERSION_USER - = REVISION_NUMBER > 0 - ? string.Format("{0} (rev.{1})", QT_VS_TOOLS_VERSION, REVISION_NUMBER) - : QT_VS_TOOLS_VERSION; - - string QT_VS_TOOLS_VERSION_MANIFEST - = REVISION_NUMBER > 0 ? QT_VS_TOOLS_VERSION_ASSEMBLY : QT_VS_TOOLS_VERSION; -#>
\ No newline at end of file + string QT_VS_TOOLS_VERSION_MANIFEST = + (v.Revision <= 0) + ? $"{v.Major}.{v.Minor}.{v.Build}" + : $"{v.Major}.{v.Minor}.{v.Build}.{v.Revision}"; +#> |