Incremented version number and updated screenshot

t1m0thyj · Oct 5, 2018 · 00e7e84 · 00e7e84
1 parent 5b8d24a
commit 00e7e84
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/screenshot.png b/screenshot.png
diff --git a/src/MainForm.Designer.cs b/src/MainForm.Designer.cs
diff --git a/src/MainForm.cs b/src/MainForm.cs
@@ -9,6 +9,7 @@
 using System.Windows.Forms;
 using System.Globalization;
 using System.IO;
+using System.Reflection;
 
 namespace PiBootstrapper
 {
@@ -79,10 +80,10 @@ private void ConfigureImage(string bootDrive, string networkConfig, bool enableS
             if (writeConfig)
             {
                 var regionInfo = new RegionInfo(CultureInfo.CurrentCulture.LCID);
-                string country = regionInfo.TwoLetterISORegionName;
+                string countryCode = regionInfo.TwoLetterISORegionName;
 
                 string configText = "ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev\n"
-                    + "update_config=1\ncountry=" + country + "\n\n" + networkConfig + "\n";
+                    + "update_config=1\ncountry=" + countryCode + "\n\n" + networkConfig + "\n";
                 File.WriteAllText(wpaSupplicantConf, configText);
             }
 
@@ -172,10 +173,11 @@ private void formControl_Modified(object sender, EventArgs e)
 
         private void MainForm_Load(object sender, EventArgs e)
         {
-            UpdateDriveList();
-
+            string appVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString();
+            versionLabel.Text += " " + appVersion.TrimEnd('.', '0');
             typeComboBox.SelectedIndex = 0;
 
+            UpdateDriveList();
             UpdateGuiState();
         }
     }

diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("PiBootstrapper")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright © 2018 Timothy Johnson")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2018.1.1")]
+//[assembly: AssemblyFileVersion("1.0.0.0")]