Split ProductUpgraderInfo into a shared and non-shared class

This will facilitate adding tests for the logic that the hooks projects do not
depend on, as those projects do not support the PhysicalFileSystem abstraction.

Author: jamill

GVFS/GVFS.Common/ProductUpgraderInfo.Shared.cs

@@ -0,0 +1,60 @@
+using GVFS.Common.Tracing;
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+namespace GVFS.Common
+{
+    public partial class ProductUpgraderInfo
+    {
+        public const string UpgradeDirectoryName = "GVFS.Upgrade";
+        public const string LogDirectory = "Logs";
+        public const string DownloadDirectory = "Downloads";
+        public const string HighestAvailableVersionFileName = "HighestAvailableVersion";
+
+        private const string RootDirectory = UpgradeDirectoryName;
+
+        public static bool IsLocalUpgradeAvailable(ITracer tracer)
+        {
+            try
+            {
+                return File.Exists(GetHighestAvailableVersionFilePath());
+            }
+            catch (Exception ex) when (
+                ex is IOException ||
+                ex is UnauthorizedAccessException ||
+                ex is NotSupportedException)
+            {
+                if (tracer != null)
+                {
+                    tracer.RelatedError(
+                        CreateEventMetadata(ex),
+                        "Exception encountered when determining if an upgrade is available.");
+                }
+            }
+
+            return false;
+        }
+
+        public static string GetHighestAvailableVersionFilePath()
+        {
+            return Path.Combine(GetUpgradesDirectoryPath(), HighestAvailableVersionFileName);
+        }
+
+        public static string GetUpgradesDirectoryPath()
+        {
+            return Paths.GetServiceDataRoot(RootDirectory);
+        }
+
+        private static EventMetadata CreateEventMetadata(Exception e)
+        {
+            EventMetadata metadata = new EventMetadata();
+            if (e != null)
+            {
+                metadata.Add("Exception", e.ToString());
+            }
+
+            return metadata;
+        }
+    }
+}

GVFS/GVFS.Common/ProductUpgraderInfo.cs

@@ -5,37 +5,8 @@
 
 namespace GVFS.Common
 {
-    public class ProductUpgraderInfo
+    public partial class ProductUpgraderInfo
     {
-        public const string UpgradeDirectoryName = "GVFS.Upgrade";
-        public const string LogDirectory = "Logs";
-        public const string DownloadDirectory = "Downloads";
-        public const string HighestAvailableVersionFileName = "HighestAvailableVersion";
-
-        protected const string RootDirectory = UpgradeDirectoryName;
-
-        public static bool IsLocalUpgradeAvailable(ITracer tracer)
-        {
-            try
-            {
-                return File.Exists(GetHighestAvailableVersionFilePath());
-            }
-            catch (Exception ex) when (
-                ex is IOException ||
-                ex is UnauthorizedAccessException ||
-                ex is NotSupportedException)
-            {
-                if (tracer != null)
-                {
-                    tracer.RelatedError(
-                        CreateEventMetadata(ex),
-                        "Exception encountered when determining if an upgrade is available.");
-                }
-            }
-
-            return false;
-        }
-
         public static void RecordHighestAvailableVersion(Version highestAvailableVersion)
         {
             string highestAvailableVersionFile = GetHighestAvailableVersionFilePath();
@@ -58,11 +29,6 @@ public static string CurrentGVFSVersion()
             return ProcessHelper.GetCurrentProcessVersion();
         }
 
-        public static string GetUpgradesDirectoryPath()
-        {
-            return Paths.GetServiceDataRoot(RootDirectory);
-        }
-
         public static string GetLogDirectoryPath()
         {
             return Path.Combine(Paths.GetServiceDataRoot(RootDirectory), LogDirectory);
@@ -95,11 +61,6 @@ public static void DeleteAllInstallerDownloads(ITracer tracer = null)
             }
         }
 
-        public static string GetHighestAvailableVersionFilePath()
-        {
-            return Path.Combine(GetUpgradesDirectoryPath(), HighestAvailableVersionFileName);
-        }
-
         private static void RecursiveDelete(string path)
         {
             if (!Directory.Exists(path))
@@ -122,16 +83,5 @@ private static void RecursiveDelete(string path)
 
             directory.Delete();
         }
-
-        private static EventMetadata CreateEventMetadata(Exception e)
-        {
-            EventMetadata metadata = new EventMetadata();
-            if (e != null)
-            {
-                metadata.Add("Exception", e.ToString());
-            }
-
-            return metadata;
-        }
     }
 }

GVFS/GVFS.Hooks/GVFS.Hooks.Mac.csproj

@@ -77,7 +77,7 @@
     <Compile Include="..\GVFS.Common\ProcessResult.cs">
       <Link>Common\ProcessResult.cs</Link>
     </Compile>
-    <Compile Include="..\GVFS.Common\ProductUpgraderInfo.cs" Link="Common\ProductUpgraderInfo.cs" />
+    <Compile Include="..\GVFS.Common\ProductUpgraderInfo.Shared.cs" Link="Common\ProductUpgraderInfo.Shared.cs" />
     <Compile Include="..\GVFS.Common\Tracing\EventLevel.cs">
       <Link>Common\Tracing\EventLevel.cs</Link>
     </Compile>

GVFS/GVFS.Hooks/GVFS.Hooks.Windows.csproj

@@ -94,8 +94,8 @@
     <Compile Include="..\GVFS.Common\ProcessResult.cs">
       <Link>Common\ProcessResult.cs</Link>
     </Compile>
-    <Compile Include="..\GVFS.Common\ProductUpgraderInfo.cs">
-      <Link>Common\ProductUpgraderInfo.cs</Link>
+    <Compile Include="..\GVFS.Common\ProductUpgraderInfo.Shared.cs">
+      <Link>Common\ProductUpgraderInfo.Shared.cs</Link>
     </Compile>
     <Compile Include="..\GVFS.Common\Tracing\EventLevel.cs">
       <Link>Common\Tracing\EventLevel.cs</Link>
@@ -139,4 +139,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>