diff --git a/src/QSP/UI/Forms/Splash.cs b/src/QSP/UI/Forms/Splash.cs index c21edfb4..5c3cb23b 100644 --- a/src/QSP/UI/Forms/Splash.cs +++ b/src/QSP/UI/Forms/Splash.cs @@ -1,5 +1,4 @@ using System; -using System.Diagnostics; using System.Reflection; namespace QSP.UI.Forms @@ -18,10 +17,8 @@ private void Splash_Load(object sender, EventArgs e) public static string AppProductVersion() { - var assembly = Assembly.GetExecutingAssembly(); - var version = FileVersionInfo.GetVersionInfo(assembly.Location); - return $"{version.ProductMajorPart}.{version.ProductMinorPart}" + - $".{version.ProductBuildPart}"; + var ver = Assembly.GetEntryAssembly().GetName().Version; + return $"{ver.Major}.{ver.Minor}.{ver.Build}"; } } } diff --git a/src/QSP/UI/ToLdgModule/AboutPage/AboutPageControl.cs b/src/QSP/UI/ToLdgModule/AboutPage/AboutPageControl.cs index 834fb2e6..adf9b50b 100644 --- a/src/QSP/UI/ToLdgModule/AboutPage/AboutPageControl.cs +++ b/src/QSP/UI/ToLdgModule/AboutPage/AboutPageControl.cs @@ -22,8 +22,7 @@ public void Init(string appName) panel1.BackColor = Color.FromArgb(160, Color.White); var ver = Assembly.GetEntryAssembly().GetName().Version; - versionLbl.Text = - $"v{ver.Major}.{ver.Minor}.{ver.Build}"; + versionLbl.Text = $"v{ver.Major}.{ver.Minor}.{ver.Build}"; } private void TryOpenFile(string fileName) diff --git a/src/QSP/UI/UserControls/FuelPlanningControl.cs b/src/QSP/UI/UserControls/FuelPlanningControl.cs index ee387abb..0ef52f71 100644 --- a/src/QSP/UI/UserControls/FuelPlanningControl.cs +++ b/src/QSP/UI/UserControls/FuelPlanningControl.cs @@ -459,8 +459,15 @@ private void Calculate(object sender, EventArgs e) if (fuelReport.TotalFuelKG > data.MaxFuelKg) { - ShowInfo(InsufficientFuelMsg( - fuelReport.TotalFuelKG, data.MaxFuelKg, WeightUnit)); + var msg = InsufficientFuelMsg( + fuelReport.TotalFuelKG, data.MaxFuelKg, WeightUnit); + + MessageBox.Show( + msg, + "Insufficient fuel", + MessageBoxButtons.OK, + MessageBoxIcon.Information); + return; } @@ -505,7 +512,7 @@ private static string InsufficientFuelMsg( fuelCapacityInt = RoundToInt(fuelCapacityKG * KgLbRatio); } - return "Insufficient fuel\n" + + return $"Fuel required for this flight is {fuelReqInt} {wtUnit}. " + $"Maximum fuel tank capacity is {fuelCapacityInt} {wtUnit}."; } diff --git a/src/QSimPlanner/Properties/AssemblyInfo.cs b/src/QSimPlanner/Properties/AssemblyInfo.cs index 837957c1..278a1990 100644 --- a/src/QSimPlanner/Properties/AssemblyInfo.cs +++ b/src/QSimPlanner/Properties/AssemblyInfo.cs @@ -7,7 +7,7 @@ [assembly: AssemblyTitle("QSimPlanner")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyCompany("")] [assembly: AssemblyProduct("QSimPlanner")] [assembly: AssemblyCopyright("Copyright © Microsoft 2016")] [assembly: AssemblyTrademark("")] @@ -31,5 +31,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.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("0.2.0.0")] +[assembly: AssemblyFileVersion("0.2.0.0")] diff --git a/src/QSimPlanner/QSimPlanner.csproj b/src/QSimPlanner/QSimPlanner.csproj index 84fe61c2..3b65f1cb 100644 --- a/src/QSimPlanner/QSimPlanner.csproj +++ b/src/QSimPlanner/QSimPlanner.csproj @@ -25,7 +25,7 @@ false true 0 - 1.0.0.%2a + 0.2.0.%2a false true