Text version support added

CommonAssemblyInfo.cs

@@ -21,3 +21,4 @@
 //
 [assembly: AssemblyVersion("2.48")]
 [assembly: AssemblyFileVersion("2.48")]
+[assembly: AssemblyInformationalVersion("2.48RC1")]

GitCommands/Patch/PatchManager.cs

@@ -606,7 +606,7 @@ namespace PatchApply
             if (result != null)
             {
                 result = result.Combine("\n", "--");
-                result = result.Combine("\n", Application.ProductName + " " + AppSettings.GitExtensionsVersionString);
+                result = result.Combine("\n", Application.ProductName + " " + AppSettings.ProductVersion);
             }
             return result;
         

GitCommands/Settings/AppSettings.cs

@@ -23,9 +23,9 @@ namespace GitCommands
     public static class AppSettings
     {
         //semi-constants
-        public static readonly string GitExtensionsVersionString;
         public static readonly char PosixPathSeparator = '/';
         public static Version AppVersion { get { return Assembly.GetCallingAssembly().GetName().Version; } }
+        public static string ProductVersion { get { return Application.ProductVersion; } }
         public const string SettingsFileName = "GitExtensions.settings";
 
         public static Lazy<string> ApplicationDataPath;
@@ -51,11 +51,6 @@ namespace GitCommands
             );
 
             _SettingsContainer = new SettingsContainer<RepoDistSettings, GitExtSettingsCache>(null, GitExtSettingsCache.FromCache(SettingsFilePath));
-            Version version = AppVersion;
-
-            GitExtensionsVersionString = version.Major.ToString() + '.' + version.Minor.ToString();
-            if (version.Build > 0)
-                GitExtensionsVersionString += '.' + version.Build.ToString();
 
             GitLog = new CommandLogger();
 

GitExtSshAskPass/SshAskPass.rc2

@@ -35,7 +35,7 @@ BEGIN
             VALUE "LegalCopyright", "Copyright 2014"
             VALUE "OriginalFilename", "GitExtSshAskPass.exe"
             VALUE "ProductName", "Git Extensions"
-            VALUE "ProductVersion", "2.48"
+            VALUE "ProductVersion", "2.48RC1"
         END
     END
     BLOCK "VarFileInfo"

GitExtensionsShellEx/GitExtensionsShellEx.rc

@@ -72,7 +72,7 @@ BEGIN
             VALUE "LegalCopyright", "Copyright 2014"
             VALUE "OriginalFilename", "GitExtensionsShellEx.dll"
             VALUE "ProductName", "Git Extensions"
-            VALUE "ProductVersion", "2.48"
+            VALUE "ProductVersion", "2.48RC1"
         END
     END
     BLOCK "VarFileInfo"

GitUI/CommandsDialogs/AboutBox.cs

@@ -49,7 +49,7 @@ namespace GitUI.CommandsDialogs
             base.OnLoad(e);
 
             _NO_TRANSLATE_labelVersionInfo.Text = string.Format("{0}{1}", _NO_TRANSLATE_labelVersionInfo.Text,
-                GitCommands.AppSettings.GitExtensionsVersionString);
+                GitCommands.AppSettings.ProductVersion);
         }
 
         private readonly string[] _contributersList;

GitUI/CommandsDialogs/FormBrowse.cs

@@ -3149,7 +3149,7 @@ namespace GitUI.CommandsDialogs
             string issueData = "--- GitExtensions";
             try
             {
-                issueData += Settings.GitExtensionsVersionString;
+                issueData += Settings.ProductVersion;
                 issueData += ", Git " + GitCommandHelpers.VersionInUse.Full;
                 issueData += ", " + Environment.OSVersion;
                 var monoVersion = GetMonoVersion();

GitUI/FormSplash.cs

@@ -65,7 +65,7 @@ namespace GitUI
         {
             base.OnLoad(e);
 
-            _NO_TRANSLATE_versionLabel.Text = string.Format(_version.Text, AppSettings.GitExtensionsVersionString);
+            _NO_TRANSLATE_versionLabel.Text = string.Format(_version.Text, AppSettings.ProductVersion);
 
             if (EnvUtils.RunningOnUnix())
                 _NO_TRANSLATE_osLabel.Text = "Unix";

Setup/set_version_to.py

@@ -19,10 +19,15 @@ if __name__ == '__main__':
     commonAssemblyInfo = open(filename, "r").readlines()
     for i in range(len(commonAssemblyInfo)):
         line = commonAssemblyInfo[i]
-        if line.find("[assembly: Assembly") != -1 and line.find("Version(") != -1:
+        if line.find("[assembly: Assembly") != -1:
+            if line.find("AssemblyVersion(") != -1 or line.find("AssemblyFileVersion(") != -1:
                 data = line.split('"')
                 data[1] = args.version
                 commonAssemblyInfo[i] = '"'.join(data)
+            if line.find("AssemblyInformationalVersion(") != -1:
+                data = line.split('"')
+                data[1] = args.text
+                commonAssemblyInfo[i] = '"'.join(data)
     outfile = open(filename, "w")
     outfile.writelines(commonAssemblyInfo)
     
@@ -48,7 +53,7 @@ if __name__ == '__main__':
             gitExtensionsShellEx[i] = ', '.join(data)
         elif line.find('"ProductVersion"') != -1:
             data = line.split(', ', 1)
-           data[1] = '"' + '.'.join(verSplitted) + '"\n'
+            data[1] = '"' + args.text + '"\n'
             gitExtensionsShellEx[i] = ', '.join(data)
     outfile = open(filename, "w")
     outfile.writelines(gitExtensionsShellEx)
@@ -75,7 +80,7 @@ if __name__ == '__main__':
             gitExtSshAskPass[i] = ', '.join(data)
         elif line.find('"ProductVersion"') != -1:
             data = line.split(', ', 1)
-           data[1] = '"' + '.'.join(verSplitted) + '"\n'
+            data[1] = '"' + args.text + '"\n'
             gitExtSshAskPass[i] = ', '.join(data)
     outfile = open(filename, "w")
     outfile.writelines(gitExtSshAskPass)

TranslationApp/TranslationHelpers.cs

@@ -109,7 +109,7 @@ namespace TranslationApp
 
         public static void SaveTranslation(string languageCode, IEnumerable<TranslationItemWithCategory> items, string filename)
         {
-            var foreignTranslation = new Translation(GitCommands.AppSettings.GitExtensionsVersionString, languageCode);
+            var foreignTranslation = new Translation(GitCommands.AppSettings.ProductVersion, languageCode);
             foreach (TranslationItemWithCategory translateItem in items)
             {
                 var item = translateItem.GetTranslationItem();