CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-04 14:11:38 +12:00
Code Issues Packages Projects Releases Wiki Activity

Use GetApplicationVersion function

Browse source
This commit is contained in:
Jaex 2023-03-05 22:16:45 +03:00
parent 0a8d613bab
commit e91fd94d2b
5 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ShareX.HelpersLib/Helpers/Helpers.cs
View file

@ -277,6 +277,17 @@ public static string GetProperName(string name, bool keepCase = false)
return sb.ToString(); return sb.ToString();
} }
public static string GetApplicationVersion(bool includeRevision = false)
{
Version version = Version.Parse(Application.ProductVersion);
string result = $"{version.Major}.{version.Minor}.{version.Build}";
if (includeRevision)
{
result = $"{result}.{version.Revision}";
}
return result;
}
/// <summary> /// <summary>
/// If version1 newer than version2 = 1 /// If version1 newer than version2 = 1
/// If version1 equal to version2 = 0 /// If version1 equal to version2 = 0
@ -302,9 +313,9 @@ public static int CompareVersion(Version version1, Version version2)
/// If version equal to ApplicationVersion = 0 /// If version equal to ApplicationVersion = 0
/// If version older than ApplicationVersion = -1 /// If version older than ApplicationVersion = -1
/// </summary> /// </summary>
public static int CompareApplicationVersion(string version) public static int CompareApplicationVersion(string version, bool includeRevision = false)
{ {
return CompareVersion(version, Application.ProductVersion); return CompareVersion(version, GetApplicationVersion(includeRevision));
} }
public static Version NormalizeVersion(string version) public static Version NormalizeVersion(string version)

5
ShareX.HelpersLib/Settings/SettingsBase.cs
View file

@ -32,7 +32,6 @@
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms;
namespace ShareX.HelpersLib namespace ShareX.HelpersLib
{ {
@ -86,7 +85,7 @@ protected virtual void OnSettingsSaveFailed(Exception e)
public bool Save(string filePath) public bool Save(string filePath)
{ {
FilePath = filePath; FilePath = filePath;
ApplicationVersion = Application.ProductVersion; ApplicationVersion = Helpers.GetApplicationVersion();
bool result = SaveInternal(FilePath); bool result = SaveInternal(FilePath);
@ -112,7 +111,7 @@ public void SaveAsync()
public MemoryStream SaveToMemoryStream(bool supportDPAPIEncryption = false) public MemoryStream SaveToMemoryStream(bool supportDPAPIEncryption = false)
{ {
ApplicationVersion = Application.ProductVersion; ApplicationVersion = Helpers.GetApplicationVersion();
MemoryStream ms = new MemoryStream(); MemoryStream ms = new MemoryStream();
SaveToStream(ms, supportDPAPIEncryption, true); SaveToStream(ms, supportDPAPIEncryption, true);

4
ShareX.HelpersLib/ShareXResources.cs
View file

@ -24,7 +24,6 @@
#endregion License Information (GPL v3) #endregion License Information (GPL v3)
using ShareX.HelpersLib.Properties; using ShareX.HelpersLib.Properties;
using System;
using System.ComponentModel; using System.ComponentModel;
using System.Drawing; using System.Drawing;
using System.Reflection; using System.Reflection;
@ -40,8 +39,7 @@ public static string UserAgent
{ {
get get
{ {
Version version = Version.Parse(Application.ProductVersion); return $"{Name}/{Helpers.GetApplicationVersion()}";
return $"{Name}/{version.Major}.{version.Minor}.{version.Build}";
} }
} }

5
ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs
View file

@ -32,7 +32,6 @@
using System.ComponentModel; using System.ComponentModel;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Windows.Forms;
namespace ShareX.UploadersLib namespace ShareX.UploadersLib
{ {
@ -111,7 +110,7 @@ public static CustomUploaderItem Init()
{ {
return new CustomUploaderItem() return new CustomUploaderItem()
{ {
Version = Application.ProductVersion, Version = Helpers.GetApplicationVersion(),
RequestMethod = HttpMethod.POST, RequestMethod = HttpMethod.POST,
Body = CustomUploaderBody.MultipartFormData Body = CustomUploaderBody.MultipartFormData
}; };
@ -449,7 +448,7 @@ public void CheckBackwardCompatibility()
DeletionURL = MigrateOldSyntax(DeletionURL); DeletionURL = MigrateOldSyntax(DeletionURL);
ErrorMessage = MigrateOldSyntax(ErrorMessage); ErrorMessage = MigrateOldSyntax(ErrorMessage);
Version = Application.ProductVersion; Version = Helpers.GetApplicationVersion();
} }
} }

2
ShareX/Forms/ApplicationSettingsForm.cs
View file

@ -745,7 +745,7 @@ private async void btnExport_Click(object sender, EventArgs e)
using (SaveFileDialog sfd = new SaveFileDialog()) using (SaveFileDialog sfd = new SaveFileDialog())
{ {
sfd.DefaultExt = "sxb"; sfd.DefaultExt = "sxb";
sfd.FileName = $"ShareX-{Application.ProductVersion}-backup.sxb"; sfd.FileName = $"ShareX-{Helpers.GetApplicationVersion()}-backup.sxb";
sfd.Filter = "ShareX backup (*.sxb)|*.sxb|All files (*.*)|*.*"; sfd.Filter = "ShareX backup (*.sxb)|*.sxb|All files (*.*)|*.*";
if (sfd.ShowDialog() == DialogResult.OK) if (sfd.ShowDialog() == DialogResult.OK)