Hesham/OWtrack
1
0
Fork 0
Code Issues 2 Pull Requests Releases 10 Wiki Activity

Merge for 1.2.4 #8

Merged
Hesham merged 11 commits from Dev into master 2018-09-01 13:26:28 +02:00
Conversation 0 Commits 11 Files Changed 7 +6 -13
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e5b0fcf173 - Show all commits

4
OWTrack/Form1.cs
View File

@ -18,8 +18,8 @@ namespace OWTrack
InitializeComponent(); InitializeComponent();
loadSave(); loadSave();
checkStatus(); checkStatus();
label4.Text = Program.Version.ToString(); label4.Text = Program.version.ToString();
Text = "OWTrack " + Program.Version.ToString(); Text = "OWTrack " + Program.version.ToString();
} }
private void checkStatus() private void checkStatus()

10
OWTrack/Program.cs
View File

@ -22,14 +22,6 @@ namespace OWTrack
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new Form1()); Application.Run(new Form1());
} }
private static Version version = new Version(Application.ProductVersion); public static Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
public static Version Version
{
get
{
return version;
}
}
} }
} }

5
OWTrack/Properties/AssemblyInfo.cs
View File

@ -35,7 +35,8 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
//[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("2.0.*")]
[assembly: AssemblyFileVersion("1.0.*")]
[assembly: NeutralResourcesLanguage("")] [assembly: NeutralResourcesLanguage("")]
[assembly: AssemblyVersion("1.2.3")]
[assembly: AssemblyFileVersion("1.2.3")]