updated version

Wampa842 · Jun 1, 2018 · c37b791 · c37b791
1 parent 7ec6ed8
commit c37b791
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 20 deletions.
diff --git a/WPlugins.Common/About.cs b/WPlugins.Common/About.cs
@@ -27,6 +27,11 @@ You should have received a copy of the GNU General Public License
 
 namespace WPlugins.Common
 {
+	public static class Info
+	{
+		public static string Version { get; } = "0.2.0";
+	}
+
 	public class About : IPEPlugin
 	{
 		public void Run(IPERunArgs args)
@@ -36,7 +41,7 @@ public void Run(IPERunArgs args)
 		}
 
 		public string Name => "About && Update";
-		public string Version => "0.1.2";
+		public string Version => Info.Version;
 		public string Description => "Information about and updates for WPlugins";
 		class PluginOptions : IPEPluginOption
 		{

diff --git a/WPlugins.Common/AboutForm.cs b/WPlugins.Common/AboutForm.cs
@@ -39,22 +39,30 @@ public partial class AboutForm : Form
 
 		private int compareSemvers(string a, string b)
 		{
-			string[] splitA = a.Split('.');
-			string[] splitB = b.Split('.');
-			int result;
-			if ((result = string.Compare(splitA[0], splitB[0])) != 0)
-				return result;
-			if ((result = string.Compare(splitA[1], splitB[1])) != 0)
-				return result;
-			if ((result = string.Compare(splitA[2], splitB[2])) != 0)
-				return result;
-			return 0;
+			try
+			{
+				string[] splitA = a.Split('.');
+				string[] splitB = b.Split('.');
+				int result;
+				if ((result = string.Compare(splitA[0], splitB[0])) != 0)
+					return result;
+				if ((result = string.Compare(splitA[1], splitB[1])) != 0)
+					return result;
+				if ((result = string.Compare(splitA[2], splitB[2])) != 0)
+					return result;
+				return 0;
+			}
+			catch
+			{
+				return -1;
+			}
 		}
 
 		public AboutForm()
 		{
-			currentVersion = Regex.Match(System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(), "^(\\d+\\.\\d+\\.\\d+).*").Groups[1].ToString();
 			InitializeComponent();
+			//currentVersion = Regex.Match(System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(), "^(\\d+\\.\\d+\\.\\d+).*").Groups[1].ToString();
+			currentVersionLabel.Text = currentVersion = Info.Version;
 		}
 
 		private void githubLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)

diff --git a/WPlugins.Common/Properties/AssemblyInfo.cs b/WPlugins.Common/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.2")]
-[assembly: AssemblyFileVersion("0.1.2.0")]
+[assembly: AssemblyVersion("0.2.0")]
+[assembly: AssemblyFileVersion("0.2.0.0")]
diff --git a/WPlugins.ObjExport/Main.cs b/WPlugins.ObjExport/Main.cs
@@ -164,6 +164,6 @@ private void Worker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArg
 
 		public string Ext => ".obj";
 
-		public string Caption => "WPlugins Obj Exporter (version " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString() + ")";
+		public string Caption => "WPlugins Obj Exporter (version " + Common.Info.Version + ")";
 	}
 }
diff --git a/WPlugins.ObjExport/Properties/AssemblyInfo.cs b/WPlugins.ObjExport/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.2")]
-[assembly: AssemblyFileVersion("0.1.2.0")]
+[assembly: AssemblyVersion("0.2.0")]
+[assembly: AssemblyFileVersion("0.2.0.0")]
diff --git a/WPlugins.ObjImport/Main.cs b/WPlugins.ObjImport/Main.cs
@@ -591,6 +591,6 @@ public IPXPmx Import(string path, IPERunArgs args)
 
 		public string Ext => ".obj";
 
-		public string Caption => "WPlugins Obj Importer (version " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString() + ")";
+		public string Caption => "WPlugins Obj Importer (version " + Common.Info.Version + ")";
 	}
 }
diff --git a/WPlugins.ObjImport/Properties/AssemblyInfo.cs b/WPlugins.ObjImport/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("0.2.0")]
+[assembly: AssemblyFileVersion("0.2.0.0")]