Migrate from old version now solig even with obsolete for future

rappen · rappen · commit 9c37c446169b · 2025-11-17T21:13:10.000+01:00
diff --git a/FetchXmlBuilder/FetchXmlBuilder.cs b/FetchXmlBuilder/FetchXmlBuilder.cs
@@ -525,24 +525,6 @@ private void LoadSettingConnection()
             }
         }
 
-        private void MigrateAfterUpgrade(string oldVersionStr, string newVersionStr)
-        {
-            var hasold = Version.TryParse(oldVersionStr, out var oldVersion);
-            var hasnew = Version.TryParse(newVersionStr, out var newVersion);
-
-            if (hasold && hasnew)
-            {
-                // From 1.2025.7.1 > newer
-                var thresholdVersion = new Version(1, 2025, 7, 1);
-                var oldcompare = oldVersion.CompareTo(thresholdVersion);
-                var newcompare = newVersion.CompareTo(thresholdVersion);
-                if (oldcompare <= 0 && newcompare > 0)
-                {
-                    settings.Layout.Enabled = settings.Results.WorkWithLayout;
-                }
-            }
-        }
-
         #endregion Private Methods
 
         #region Private Event Handlers
@@ -598,11 +580,8 @@ private void FetchXmlBuilder_Load(object sender, EventArgs e)
             var version = ass.Version.ToString();
             if (!version.Equals(settings.CurrentVersion))
             {
-                MigrateAfterUpgrade(settings.CurrentVersion, version);
-                // Reset some settings when new version is deployed
                 var oldversion = settings.CurrentVersion;
-                settings.CurrentVersion = version;
-                SettingsManager.Instance.Save(typeof(FetchXmlBuilder), settings, "[Common]");
+                settings.Migrate(version);
                 LogUse("ShowWelcome", ai2: true);
                 Welcome.ShowWelcome(this, oldversion);
             }
@@ -988,18 +967,12 @@ private void tsbSupporting_Click(object sender, EventArgs e)
 
         private void reloadBySolutionToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            bool showConfirmBox() =>
-                MessageBoxEx.Show(this,
-                    "Reloading all metadata may take a while  (10-300 secs) .\n\nDo you want to continue?",
-                    "Reload Metadata",
-                    MessageBoxButtons.OKCancel,
-                    MessageBoxIcon.Exclamation
-                ) == DialogResult.OK;
-
             RefreshMetadataOptions.Show(this, (bool ok, FilterSetting filter) =>
             {
                 if (!ok)
+                {
                     return;
+                }
                 RefreshEntities(filter);
             });
         }
diff --git a/FetchXmlBuilder/Settings/FXBSettings.cs b/FetchXmlBuilder/Settings/FXBSettings.cs
@@ -64,6 +64,23 @@ internal void Save()
         {
             SettingsManager.Instance.Save(typeof(FetchXmlBuilder), this, "[Common]");
         }
+
+        internal void Migrate(string newVersionStr)
+        {
+            if (Version.TryParse(CurrentVersion, out var oldV) &&
+                Version.TryParse(newVersionStr, out var newV))
+            {
+                var threshold1 = new Version(1, 2025, 7, 1);
+                if (oldV <= threshold1 && newV > threshold1)
+                {
+#pragma warning disable 612, 618 // Use of obsolete member for one-time migration
+                    Layout.Enabled = Results.WorkWithLayout;
+#pragma warning restore 612, 618
+                }
+                CurrentVersion = newVersionStr;
+                SettingsManager.Instance.Save(typeof(FetchXmlBuilder), this, "[Common]");
+            }
+        }
     }
 
     public class ExecuteOptions
@@ -114,6 +131,7 @@ public class ResultOptions
         public bool LocalTime { get; set; }
         public bool CopyHeaders { get; set; } = true;
         public bool ExcelAdvanced { get; set; } = false;
+        public bool ExcelAddLinks { get; set; } = true;
         public bool AlwaysNewWindow { get; set; } = false;
         public bool QuickFilter { get; set; } = false;
         public bool PagingCookie { get; set; } = false;
