From 89ed7f2c16c9e80ad51ce877ab4384c870c3f255 Mon Sep 17 00:00:00 2001
From: WaGi <wagi.coding@gmail.com>
Date: Thu, 26 Sep 2019 16:10:40 +0200
Subject: [PATCH] Restore settings from previous versions from now on
---
WaGis IP-Blacklister/App.config | 5 ++++-
WaGis IP-Blacklister/Form1.cs | 14 ++++++++++++--
WaGis IP-Blacklister/Properties/AssemblyInfo.cs | 4 ++--
.../Properties/Settings.Designer.cs | 14 +++++++++++++-
WaGis IP-Blacklister/Properties/Settings.settings | 3 +++
5 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/WaGis IP-Blacklister/App.config b/WaGis IP-Blacklister/App.config
index fd4e127..4e74fe3 100644
--- a/WaGis IP-Blacklister/App.config
+++ b/WaGis IP-Blacklister/App.config
@@ -15,7 +15,7 @@
</setting>
<setting name="Protocol" serializeAs="String">
<value>TCP</value>
- </setting>
+ </setting>
<setting name="Direction" serializeAs="String">
<value>BOTH</value>
</setting>
@@ -40,6 +40,9 @@
<setting name="Protocol_Number" serializeAs="String">
<value>6</value>
</setting>
+ <setting name="UpgradeRequired" serializeAs="String">
+ <value>True</value>
+ </setting>
</WaGis_IP_Blacklister.Properties.Settings>
</userSettings>
</configuration>
\ No newline at end of file
diff --git a/WaGis IP-Blacklister/Form1.cs b/WaGis IP-Blacklister/Form1.cs
index 72b99ee..42f298d 100644
--- a/WaGis IP-Blacklister/Form1.cs
+++ b/WaGis IP-Blacklister/Form1.cs
@@ -31,8 +31,8 @@ public partial class MainForm : Form
int BlockSize = 1000;
- int protocolNumber = Properties.Settings.Default.Protocol_Number;
- string protDesc = Properties.Settings.Default.Protocol;
+ int protocolNumber;
+ string protDesc;
//[DllImport("user32.dll", EntryPoint = "ShowCaret")] //
//public static extern long ShowCaret(IntPtr hwnd); //
@@ -45,6 +45,16 @@ public MainForm()
lblInfo.Text = string.Empty;
notifyIcon1.Icon = new Icon(this.Icon, 40, 40);
+
+ if (Properties.Settings.Default.UpgradeRequired)
+ {
+ Properties.Settings.Default.Upgrade();
+ Properties.Settings.Default.UpgradeRequired = false;
+ Properties.Settings.Default.Save();
+ }
+
+ protocolNumber = Properties.Settings.Default.Protocol_Number;
+ protDesc = Properties.Settings.Default.Protocol;
}
static bool Win10orWinServer()
diff --git a/WaGis IP-Blacklister/Properties/AssemblyInfo.cs b/WaGis IP-Blacklister/Properties/AssemblyInfo.cs
index 48b5675..af25d94 100644
--- a/WaGis IP-Blacklister/Properties/AssemblyInfo.cs
+++ b/WaGis IP-Blacklister/Properties/AssemblyInfo.cs
@@ -20,5 +20,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.3.7.5")]
-[assembly: AssemblyFileVersion("1.3.7.5")]
+[assembly: AssemblyVersion("1.3.8")]
+[assembly: AssemblyFileVersion("1.3.8")]
diff --git a/WaGis IP-Blacklister/Properties/Settings.Designer.cs b/WaGis IP-Blacklister/Properties/Settings.Designer.cs
index 95388c9..65b835a 100644
--- a/WaGis IP-Blacklister/Properties/Settings.Designer.cs
+++ b/WaGis IP-Blacklister/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace WaGis_IP_Blacklister.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -131,5 +131,17 @@ public int Protocol_Number {
this["Protocol_Number"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("True")]
+ public bool UpgradeRequired {
+ get {
+ return ((bool)(this["UpgradeRequired"]));
+ }
+ set {
+ this["UpgradeRequired"] = value;
+ }
+ }
}
}
diff --git a/WaGis IP-Blacklister/Properties/Settings.settings b/WaGis IP-Blacklister/Properties/Settings.settings
index db83d54..34da45f 100644
--- a/WaGis IP-Blacklister/Properties/Settings.settings
+++ b/WaGis IP-Blacklister/Properties/Settings.settings
@@ -30,5 +30,8 @@
<Setting Name="Protocol_Number" Type="System.Int32" Scope="User">
<Value Profile="(Default)">6</Value>
</Setting>
+ <Setting Name="UpgradeRequired" Type="System.Boolean" Scope="User">
+ <Value Profile="(Default)">True</Value>
+ </Setting>
</Settings>
</SettingsFile>
\ No newline at end of file