Move EDDI Upgrader into its own namespace.

EDDI.sln

@@ -297,9 +297,9 @@ Global
 		{7D25AF37-6EF2-4210-B079-14672BECDBB0} = {DBAE065B-DD96-4349-9189-D0935280BB0B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {28C2EDB6-0FA0-409F-987C-7A24F542D0CF}
-		RESX_ShowErrorsInErrorList = False
-		RESX_AutoCreateNewLanguageFiles = True
 		RESX_TaskErrorCategory = Message
+		RESX_AutoCreateNewLanguageFiles = True
+		RESX_ShowErrorsInErrorList = False
+		SolutionGuid = {28C2EDB6-0FA0-409F-987C-7A24F542D0CF}
 	EndGlobalSection
 EndGlobal

EDDI/App.xaml.cs

@@ -1,6 +1,7 @@
 using EddiConfigService;
 using EddiConfigService.Configurations;
 using EddiCore;
+using EddiCore.Upgrader;
 using System;
 using System.Diagnostics;
 using System.Globalization;
@@ -43,7 +44,7 @@ public static void Main()
 
             // Start by fetching information from the update server, and handling appropriately
             EddiUpgrader.CheckUpgrade();
-            if (EddiUpgrader.UpgradeRequired)
+            if ( EddiUpgrader.UpgradeRequired)
             {
                 // We are too old to continue; initialize in a "safe mode". 
                 EDDI.Init(true);
@@ -127,7 +128,7 @@ private static void StartTelemetryService()
             {
                 CrashLogger(args.Exception);
             };
-            App.Current.DispatcherUnhandledException += (sender, args) =>
+            Current.DispatcherUnhandledException += (sender, args) =>
             {
                 CrashLogger(args.Exception);
             };

EDDI/MainWindow.xaml.cs

@@ -2,6 +2,7 @@
 using EddiConfigService;
 using EddiConfigService.Configurations;
 using EddiCore;
+using EddiCore.Upgrader;
 using EddiDataDefinitions;
 using EddiDataProviderService;
 using EddiSpeechService;

EDDI/EddiUpgrader.cs → EDDI/Upgrader/EddiUpgrader.cs

@@ -1,13 +1,13 @@
-using EddiConfigService;
-using EddiCore;
+using Eddi;
+using EddiConfigService;
 using EddiSpeechService;
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using Utilities;
 
-namespace Eddi
+namespace EddiCore.Upgrader
 {
     public class EddiUpgrader
     {
@@ -89,7 +89,7 @@ public static async void Upgrade()
                 {
                     Logging.Info( $"Downloading upgrade from {UpgradeLocation}" );
                     SpeechService.Instance.Say(null, Eddi.Properties.EddiResources.downloading_upgrade, 0);
-                    var updateFile = await Net.DownloadFileAsync(UpgradeLocation, @"EDDI-update.exe");
+                    var updateFile = await Utilities.Net.DownloadFileAsync(UpgradeLocation, @"EDDI-update.exe");
                     if (updateFile == null)
                     {
                         SpeechService.Instance.Say(null, Eddi.Properties.EddiResources.download_failed, 0);

Utilities/InstanceInfo.cs → EDDI/Upgrader/InstanceInfo.cs

@@ -1,4 +1,4 @@
-namespace Utilities
+namespace EddiCore.Upgrader
 {
     /// <summary>
     /// Information obtained from the update server

Utilities/ServerInfo.cs → EDDI/Upgrader/ServerInfo.cs

@@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
 
-namespace Utilities
+namespace EddiCore.Upgrader
 {
     /// <summary>
     /// Information obtained from the update server
@@ -28,7 +28,7 @@ public class ServerInfo
         /// </summary>
         public static ServerInfo FromServer(string baseUri)
         {
-            string data = Net.DownloadString(baseUri + "info.json");
+            string data = Utilities.Net.DownloadString(baseUri + "info.json");
             return data == null ? null : JsonConvert.DeserializeObject<ServerInfo>(data);
         }
     }

VoiceAttackResponder/VoiceAttackPlugin.cs

@@ -1,4 +1,5 @@
 using Eddi;
+using EddiCore.Upgrader;
 using EddiCargoMonitor;
 using EddiCompanionAppService;
 using EddiCore;