From 9342c28ce81663234afe0b5a1b2ae33cfa51f572 Mon Sep 17 00:00:00 2001
From: Chris Kaczor <chris@kaczorzoo.net>
Date: Thu, 22 Feb 2018 14:23:30 -0500
Subject: [PATCH] Move settings backup/restore to Common

---
 .gitmodules                        |  3 ++
 App.xaml.cs                        |  4 +-
 Common                             |  1 +
 ProcessCpuUsageStatusWindow.csproj |  7 +++-
 ProcessCpuUsageStatusWindow.sln    | 14 +++++++
 SettingsExtensions.cs              | 63 ------------------------------
 WindowSource.cs                    |  2 +-
 7 files changed, 27 insertions(+), 67 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 Common
 delete mode 100644 SettingsExtensions.cs

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a081308
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Common"]
+	path = Common
+	url = https://github.com/ckaczor/Common.git
diff --git a/App.xaml.cs b/App.xaml.cs
index 78aec92..a1253dc 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -1,9 +1,9 @@
 using FloatingStatusWindowLibrary;
 using ProcessCpuUsageStatusWindow.Properties;
+using Squirrel;
 using System;
 using System.Diagnostics;
 using System.Windows;
-using Squirrel;
 
 namespace ProcessCpuUsageStatusWindow
 {
@@ -16,7 +16,7 @@ namespace ProcessCpuUsageStatusWindow
         [STAThread]
         public static void Main(string[] args)
         {
-            SquirrelAwareApp.HandleEvents(onAppUpdate: version => SettingsExtensions.RestoreSettings());
+            SquirrelAwareApp.HandleEvents(onAppUpdate: version => Common.Settings.Extensions.RestoreSettings());
 
             var application = new App();
             application.InitializeComponent();
diff --git a/Common b/Common
new file mode 160000
index 0000000..ecd3717
--- /dev/null
+++ b/Common
@@ -0,0 +1 @@
+Subproject commit ecd3717eab737ede13023c7c81baa34488a05609
diff --git a/ProcessCpuUsageStatusWindow.csproj b/ProcessCpuUsageStatusWindow.csproj
index 07347ea..0f6d33f 100644
--- a/ProcessCpuUsageStatusWindow.csproj
+++ b/ProcessCpuUsageStatusWindow.csproj
@@ -130,7 +130,6 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SettingsExtensions.cs" />
     <Compile Include="WindowSource.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -170,6 +169,12 @@
     <None Include="README.md" />
     <None Include="Resources\ApplicationIcon.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="Common\Common.csproj">
+      <Project>{17864d82-457d-4a0a-bc10-1d07f2b3a5d6}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ProcessCpuUsageStatusWindow.sln b/ProcessCpuUsageStatusWindow.sln
index 01c3522..8b0a902 100644
--- a/ProcessCpuUsageStatusWindow.sln
+++ b/ProcessCpuUsageStatusWindow.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProcessCpuUsageStatusWindow", "ProcessCpuUsageStatusWindow.csproj", "{C3C29363-2E3C-4478-B2A6-125DEA683E0D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csproj", "{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,6 +29,18 @@ Global
 		{C3C29363-2E3C-4478-B2A6-125DEA683E0D}.Release|x64.Build.0 = Release|Any CPU
 		{C3C29363-2E3C-4478-B2A6-125DEA683E0D}.Release|x86.ActiveCfg = Release|Any CPU
 		{C3C29363-2E3C-4478-B2A6-125DEA683E0D}.Release|x86.Build.0 = Release|Any CPU
+		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|x64.ActiveCfg = Debug|x64
+		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|x64.Build.0 = Debug|x64
+		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|x86.ActiveCfg = Debug|x86
+		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Debug|x86.Build.0 = Debug|x86
+		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|x64.ActiveCfg = Release|x64
+		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|x64.Build.0 = Release|x64
+		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|x86.ActiveCfg = Release|x86
+		{17864D82-457D-4A0A-BC10-1D07F2B3A5D6}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/SettingsExtensions.cs b/SettingsExtensions.cs
deleted file mode 100644
index 59b2d45..0000000
--- a/SettingsExtensions.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Configuration;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
-
-namespace ProcessCpuUsageStatusWindow
-{
-    public static class SettingsExtensions
-    {
-        public static void BackupSettings()
-        {
-            Debugger.Launch();
-
-            var settingsFile = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.PerUserRoamingAndLocal).FilePath;
-            var destination = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\..\last.config";
-            File.Copy(settingsFile, destination, true);
-        }
-
-        public static void RestoreSettings()
-        {
-            Debugger.Launch();
-
-            var destFile = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.PerUserRoamingAndLocal).FilePath;
-            var sourceFile = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + @"\..\last.config";
-
-            if (!File.Exists(sourceFile))
-                return;
-
-            var destDirectory = Path.GetDirectoryName(destFile);
-
-            if (destDirectory == null)
-                return;
-
-            try
-            {
-                Directory.CreateDirectory(destDirectory);
-            }
-            catch (Exception exception)
-            {
-                Console.WriteLine(exception);
-            }
-
-            try
-            {
-                File.Copy(sourceFile, destFile, true);
-            }
-            catch (Exception exception)
-            {
-                Console.WriteLine(exception);
-            }
-
-            try
-            {
-                File.Delete(sourceFile);
-            }
-            catch (Exception exception)
-            {
-                Console.WriteLine(exception);
-            }
-        }
-    }
-}
diff --git a/WindowSource.cs b/WindowSource.cs
index 719fc46..ec35016 100644
--- a/WindowSource.cs
+++ b/WindowSource.cs
@@ -45,7 +45,7 @@ namespace ProcessCpuUsageStatusWindow
                     _dispatcher.Invoke(() => _floatingStatusWindow.SetText(Resources.Updating));
                     Thread.Sleep(500);
 
-                    SettingsExtensions.BackupSettings();
+                    Common.Settings.Extensions.BackupSettings();
 
 #if !DEBUG
                     await updateManager.DownloadReleases(new[] { lastVersion });