Fix settings migration crash (#348)

* Ensure the new settings directory exists before trying to copy the old settings file into it.
* Make settings upgrade exceptions nonfatal

Author: papeh

src/FLExBridge/Program.cs

@@ -52,10 +52,10 @@ static void Main(string[] args)
 				// exception handler.
 			}
 
-			Settings.UpgradeSettingsIfNecessary(Settings.Default, Application.CompanyName, Application.ProductName);
-
 			SetUpErrorHandling();
 
+			Settings.UpgradeSettingsIfNecessary(Settings.Default, Application.CompanyName, Application.ProductName);
+
 			// Use Gtk3
 			GraphicsManager.GtkVersionInUse = GraphicsManager.GTK3;
 

src/LibTriboroughBridge-ChorusPlugin/Properties/Settings.cs

@@ -8,6 +8,7 @@
 using System.Linq;
 using SIL.LCModel.Utils;
 using SIL.PlatformUtilities;
+using SIL.Reporting;
 
 namespace LibTriboroughBridgeChorusPlugin.Properties
 {
@@ -25,12 +26,26 @@ public static void UpgradeSettingsIfNecessary<T>(T settings, string companyName,
 				return;
 			}
 
-			MigrateNonCrossPlatformSettings(companyName, appName);
+			TryTo(() => MigrateNonCrossPlatformSettings(companyName, appName));
 
-			settings.Upgrade();
+			TryTo(settings.Upgrade);
+
+			// Whether or not we succeeded, don't try again.
 			settings.CallUpgrade = false;
 		}
 
+		private static void TryTo(Action doThis)
+		{
+			try
+			{
+				doThis();
+			}
+			catch (Exception e)
+			{
+				ErrorReport.ReportNonFatalExceptionWithMessage(e, "Failed to upgrade settings");
+			}
+		}
+
 		internal static void MigrateNonCrossPlatformSettings(string companyName, string appName)
 		{
 			// Find settings from earlier versions that didn't use CrossPlatformSettingsProvider
@@ -51,6 +66,7 @@ internal static void MigrateNonCrossPlatformSettings(string companyName, string
 			var newSettingsFilePath = Path.Combine(newSettingsDir, settingsFileName);
 			if (FileUtils.FileExists(latestOldSettingsFile) && !FileUtils.FileExists(newSettingsFilePath))
 			{
+				FileUtils.EnsureDirectoryExists(newSettingsDir);
 				FileUtils.Copy(latestOldSettingsFile, newSettingsFilePath);
 			}
 		}

src/LibTriboroughBridge-ChorusPluginTests/SettingsTests.cs

@@ -67,6 +67,8 @@ public void MigrateCrossPlatformSettings_MigratesLatest([Values("Url", "StrongNa
 			var newSettingsFilePath = Path.Combine(NewAppDirPath, prevVer, SettingsFileName);
 			Assert.That(FileUtils.FileExists(newSettingsFilePath));
 			Assert.That(_fileOs.ReadAllText(newSettingsFilePath), Is.EqualTo(prevConfigXml));
+			Assert.That(FileUtils.DirectoryExists(Path.GetDirectoryName(newSettingsFilePath)),
+				"MockFileOS doesn't always care about directories existing. Real filesystems do.");
 		}
 
 		[Test]

src/RepositoryUtility/Program.cs

@@ -49,11 +49,11 @@ static void Main()
 				// exception handler.
 			}
 
+			SetUpErrorHandling();
+
 			LibTriboroughBridgeChorusPlugin.Properties.Settings.UpgradeSettingsIfNecessary(Settings.Default,
 				Application.CompanyName, SettingsProvider.ProductNameForSettings);
 
-			SetUpErrorHandling();
-
 			// Use Gtk3
 			GraphicsManager.GtkVersionInUse = GraphicsManager.GTK3;