2.3.0.5 - Changed .NET profile to use .NET 4 instead of .NET 4 Client…

…. Application now enables visual styles. Fixed bug with upgrade path.
gavinkendall · Jun 24, 2020 · 57d2a17 · 57d2a17
1 parent 7c39210
commit 57d2a17
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 10 deletions.
diff --git a/Program.cs b/Program.cs
@@ -64,6 +64,7 @@ private static void Main(string[] args)
                         // If we're not already running then start a new instance of the application.
                         Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.High;
 
+                        Application.EnableVisualStyles();
                         Application.SetCompatibleTextRenderingDefault(false);
                         Application.Run(new FormMain());
                     }

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // 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("2.3.0.4")]
-[assembly: AssemblyFileVersion("2.3.0.4")]
+[assembly: AssemblyVersion("2.3.0.5")]
+[assembly: AssemblyFileVersion("2.3.0.5")]
 [assembly: NeutralResourcesLanguageAttribute("en-CA")]
diff --git a/app.config b/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
diff --git a/app.manifest b/app.manifest
@@ -3,7 +3,7 @@
   <assemblyIdentity
     type="win32"
     name="GavinKendall.AutoScreenCapture"
-    version="2.3.0.4"/>
+    version="2.3.0.5"/>
   <asmv3:application>
     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
       <dpiAware>True/PM</dpiAware>

diff --git a/autoscreen.csproj b/autoscreen.csproj
@@ -17,7 +17,8 @@
     </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -307,6 +308,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="app.config" />
     <None Include="app.manifest">
       <SubType>Designer</SubType>
     </None>

diff --git a/interface/FormAbout.resx b/interface/FormAbout.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="richTextBoxDeveloper.Text" xml:space="preserve">
-    <value>Auto Screen Capture 2.3.0.4 ("Boombayah")
+    <value>Auto Screen Capture 2.3.0.5 ("Boombayah")
 Developed by Gavin Kendall (2008 - 2020)
 
 https://autoscreen.sourceforge.io/

diff --git a/modules/triggers/TriggerCollection.cs b/modules/triggers/TriggerCollection.cs
@@ -217,12 +217,12 @@ public bool LoadXmlFileAndAddTriggers()
                         ScreenCaptureInterval = 0
                     };
 
-                    Trigger triggerInterfaceClosingHideInterface = new Trigger()
+                    Trigger triggerInterfaceClosingExitApplication = new Trigger()
                     {
                         Active = true,
-                        Name = "Interface Closing -> Hide",
+                        Name = "Interface Closing -> Exit",
                         ConditionType = TriggerConditionType.InterfaceClosing,
-                        ActionType = TriggerActionType.HideInterface,
+                        ActionType = TriggerActionType.ExitApplication,
                         Date = DateTime.Now,
                         Time = DateTime.Now,
                         ScreenCaptureInterval = 0
@@ -243,7 +243,7 @@ public bool LoadXmlFileAndAddTriggers()
                     Add(triggerApplicationStartShowInterface);
                     Add(triggerScreenCaptureStartedHideInterface);
                     Add(triggerScreenCaptureStoppedShowInterface);
-                    Add(triggerInterfaceClosingHideInterface);
+                    Add(triggerInterfaceClosingExitApplication);
                     Add(triggerLimitReachedStopScreenCapture);
 
                     SaveToXmlFile();

diff --git a/settings/SettingCollection.cs b/settings/SettingCollection.cs
@@ -342,6 +342,13 @@ public void Upgrade()
 
                 Settings.VersionManager.OldUserSettings = oldUserSettings;
 
+                if (string.IsNullOrEmpty(AppCodename) || string.IsNullOrEmpty(AppVersion))
+                {
+                    Log.WriteMessage("No settings file found. Aborting upgrade path");
+
+                    return;
+                }
+
                 var versionInConfig = new Version(AppCodename, AppVersion, false);
 
                 if (versionInConfig.VersionString.Equals("2.2.0.0") ||

diff --git a/settings/Settings.cs b/settings/Settings.cs
@@ -134,7 +134,8 @@ public static void Initialize()
                 new Version(CODENAME_BOOMBAYAH, "2.3.0.0"), // Faster startup, commands can be issued to a running instance, multiple schedules, more trigger conditions and trigger actions, and help tips in the help bar.
                 new Version(CODENAME_BOOMBAYAH, "2.3.0.1"), // Fixed bug with FilenameLengthLimit application setting.
                 new Version(CODENAME_BOOMBAYAH, "2.3.0.2"), // Keyboard Shortcuts implemented.
-                new Version(CODENAME_BOOMBAYAH, "2.3.0.3") // Fixed bug when creating a new Trigger.
+                new Version(CODENAME_BOOMBAYAH, "2.3.0.3"), // Fixed bug when creating a new Trigger.
+                new Version(CODENAME_BOOMBAYAH, "2.3.0.4") // StopOnLowDiskError setting implemented.
             };
 
             Application = new SettingCollection