Fix settings not upgrading properly

JungleDruid · Aug 30, 2023 · b8e9797 · b8e9797
1 parent b43e663
commit b8e9797
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 7 deletions.
diff --git a/App.config b/App.config
@@ -69,6 +69,9 @@
             <setting name="CultureName" serializeAs="String">
                 <value />
             </setting>
+            <setting name="SettingsVersion" serializeAs="String">
+                <value />
+            </setting>
         </BG3LocalizationMerger.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/BG3LocalizationMerger.csproj b/BG3LocalizationMerger.csproj
@@ -9,6 +9,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <NeutralLanguage>en</NeutralLanguage>
     <Version>$(VersionPrefix)1.0.1</Version>
+    <SignAssembly>False</SignAssembly>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -1,4 +1,5 @@
-using BG3LocalizationMerger.Resources.Strings;
+using BG3LocalizationMerger.Properties;
+using BG3LocalizationMerger.Resources.Strings;
 using ModernWpf.Controls.Primitives;
 using Ookii.Dialogs.Wpf;
 using System;
@@ -7,6 +8,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -27,10 +29,10 @@ public partial class MainWindow
         public MainWindow()
         {
             s_instance = this;
-            Properties.Settings.Default.Upgrade();
-            var props = Properties.Settings.Default;
+            UpgradeSettings();
             InitializeComponent();
 
+            var props = Settings.Default;
             UnpackedDataTextBox.Text = props.UnpackedDataPath;
             LanguagePackTextBox.Text = props.LanguagePackPath;
             ReferencePackTextBox.Text = props.ReferencePackPath;
@@ -39,11 +41,25 @@ public MainWindow()
             InitCulture();
         }
 
+        private static void UpgradeSettings()
+        {
+            var version = Assembly.GetEntryAssembly()?.GetName().Version;
+            if (version != null)
+            {
+                if (Settings.Default.SettingsVersion != version.ToString())
+                {
+                    Settings.Default.Upgrade();
+                    Settings.Default.SettingsVersion = version.ToString();
+                    Settings.Default.Save();
+                }
+            }
+        }
+
         private void InitCulture()
         {
             LanguageComboBox.ItemsSource = TranslationSource.GetAllCultures();
 
-            string defaultCultureName = Properties.Settings.Default.CultureName;
+            string defaultCultureName = Settings.Default.CultureName;
             var defaultCulture = string.IsNullOrEmpty(defaultCultureName)
                 ? CultureInfo.CurrentUICulture
                 : new CultureInfo(defaultCultureName);
@@ -205,7 +221,7 @@ private async void Window_Closing(object sender, System.ComponentModel.CancelEve
 
         private void SaveSettings()
         {
-            var props = Properties.Settings.Default;
+            var props = Settings.Default;
             props.UnpackedDataPath = UnpackedDataTextBox.Text;
             props.LanguagePackPath = LanguagePackTextBox.Text;
             props.ReferencePackPath = ReferencePackTextBox.Text;
@@ -334,8 +350,8 @@ private void LanguageComboBox_SelectionChanged(object sender, SelectionChangedEv
             if (LanguageComboBox.SelectedItem is CultureInfo culture)
             {
                 TranslationSource.Instance.Culture = culture;
-                Properties.Settings.Default.CultureName = culture.Name;
-                Properties.Settings.Default.Save();
+                Settings.Default.CultureName = culture.Name;
+                Settings.Default.Save();
             }
         }
     }

diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
diff --git a/Properties/Settings.settings b/Properties/Settings.settings
@@ -59,5 +59,8 @@
     <Setting Name="CultureName" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="SettingsVersion" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>