Automatic Update

csbernath · csbernath · commit 97a9ff455983 · 2018-04-23T17:34:03.000+02:00
diff --git a/DataCommander.Updater/DataCommander.Updater.csproj.user b/DataCommander.Updater/DataCommander.Updater.csproj.user
@@ -0,0 +1,6 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+    <StartArguments>"c:\Users\bernathcs\AppData\Local\Data Commander\DataCommander.exe"</StartArguments>
+  </PropertyGroup>
+</Project>
diff --git a/DataCommander.Updater/Program.cs b/DataCommander.Updater/Program.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Diagnostics;
 using System.Windows.Forms;
+using Foundation.Deployment;
 
 namespace DataCommander.Updater
 {
@@ -15,7 +16,7 @@ static void Main(string[] args)
 
                 var applicationExeFileName = args[0];
                 var updaterDirectory = Environment.CurrentDirectory;
-                Foundation.Deployment.Updater.Update(updaterDirectory, applicationExeFileName);
+                DeploymentHelper.Update(updaterDirectory, applicationExeFileName);
 
                 //Application.EnableVisualStyles();
                 //Application.SetCompatibleTextRenderingDefault(false);
diff --git a/DataCommander/DataCommander.csproj b/DataCommander/DataCommander.csproj
@@ -171,23 +171,20 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CheckForUpdateCompleted.cs" />
-    <Compile Include="CheckForUpdatesStarted.cs" />
-    <Compile Include="DownloadingNewVersionStarted.cs" />
-    <Compile Include="DownloadProgressChanged.cs" />
-    <Compile Include="Event.cs" />
-    <Compile Include="EventHandler.cs" />
-    <Compile Include="NewVersionDownloaded.cs" />
-    <Compile Include="Updater.cs" />
-    <Compile Include="UpdaterForm.cs">
+    <Compile Include="Update\Events\CheckForUpdateCompleted.cs" />
+    <Compile Include="Update\Events\CheckForUpdatesStarted.cs" />
+    <Compile Include="Update\Events\DownloadingNewVersionStarted.cs" />
+    <Compile Include="Update\Events\DownloadProgressChanged.cs" />
+    <Compile Include="Update\Events\Event.cs" />
+    <Compile Include="Update\EventHandler.cs" />
+    <Compile Include="Update\Events\NewVersionDownloaded.cs" />
+    <Compile Include="Update\Updater.cs" />
+    <Compile Include="Update\UpdaterForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UpdaterForm.Designer.cs">
+    <Compile Include="Update\UpdaterForm.Designer.cs">
       <DependentUpon>UpdaterForm.cs</DependentUpon>
     </Compile>
-    <Content Include="Version.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
@@ -232,7 +229,7 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="UpdaterForm.resx">
+    <EmbeddedResource Include="Update\UpdaterForm.resx">
       <DependentUpon>UpdaterForm.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
diff --git a/DataCommander/DataCommander.csproj.user b/DataCommander/DataCommander.csproj.user
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
     <PublishUrlHistory />
     <InstallUrlHistory />
     <SupportUrlHistory />
diff --git a/DataCommander/EntryPoint.cs b/DataCommander/EntryPoint.cs
@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Windows.Forms;
 using DataCommander.Providers;
+using DataCommander.Update;
 using Foundation.Configuration;
 using Foundation.Diagnostics.MethodProfiler;
 using Foundation.Log;
diff --git a/DataCommander/Update/EventHandler.cs b/DataCommander/Update/EventHandler.cs
@@ -1,31 +1,31 @@
 ﻿using System.Windows.Forms;
+using DataCommander.Update.Events;
 using Foundation.Windows.Forms;
 
-namespace DataCommander
+namespace DataCommander.Update
 {
     internal sealed class EventHandler
     {
         private readonly UpdaterForm _updaterForm;
         public EventHandler(UpdaterForm updaterForm) => _updaterForm = updaterForm;
         public void Handle(Event @event) => Handle((dynamic) @event);
         private void Handle(CheckForUpdatesStarted @event) => _updaterForm.Invoke(() => _updaterForm.Log("Checking for updates..."));
+
         private void Handle(DownloadingNewVersionStarted @event) => _updaterForm.Invoke(() =>
         {
             _updaterForm.WindowState = FormWindowState.Normal;
-            Application.DoEvents();
             _updaterForm.Log("Downloading new version...");
-            Application.DoEvents();
         });
 
-        private void Handle(DownloadProgressChanged @event) => _updaterForm.Invoke(() => _updaterForm.Log($"{@event.DownloadProgressChangedEventArgs.ProgressPercentage}% complete."));
+        private void Handle(DownloadProgressChanged @event) =>
+            _updaterForm.Invoke(() => _updaterForm.Log($"{@event.DownloadProgressChangedEventArgs.ProgressPercentage}% complete."));
+
         private void Handle(NewVersionDownloaded @event) => _updaterForm.Invoke(() => _updaterForm.Log("New version downloaded."));
 
         private void Handle(CheckForUpdateCompleted @event) => _updaterForm.Invoke(() =>
         {
             _updaterForm.Log("Checking for updates completed.");
-            Application.DoEvents();
             _updaterForm.Close();
-            Application.DoEvents();
         });
     }
 }
diff --git a/DataCommander/Update/Events/CheckForUpdateCompleted.cs b/DataCommander/Update/Events/CheckForUpdateCompleted.cs
@@ -1,4 +1,4 @@
-﻿namespace DataCommander
+﻿namespace DataCommander.Update.Events
 {
     public sealed class CheckForUpdateCompleted : Event
     {
diff --git a/DataCommander/Update/Events/CheckForUpdatesStarted.cs b/DataCommander/Update/Events/CheckForUpdatesStarted.cs
@@ -1,4 +1,4 @@
-﻿namespace DataCommander
+﻿namespace DataCommander.Update.Events
 {
     public sealed class CheckForUpdatesStarted : Event
     {
diff --git a/DataCommander/Update/Events/DownloadProgressChanged.cs b/DataCommander/Update/Events/DownloadProgressChanged.cs
@@ -1,6 +1,6 @@
 ﻿using System.Net;
 
-namespace DataCommander
+namespace DataCommander.Update.Events
 {
     public sealed class DownloadProgressChanged : Event
     {
diff --git a/DataCommander/Update/Events/DownloadingNewVersionStarted.cs b/DataCommander/Update/Events/DownloadingNewVersionStarted.cs
@@ -1,4 +1,4 @@
-﻿namespace DataCommander
+﻿namespace DataCommander.Update.Events
 {
     public sealed class DownloadingNewVersionStarted : Event
     {
diff --git a/DataCommander/Update/Events/Event.cs b/DataCommander/Update/Events/Event.cs
@@ -1,4 +1,4 @@
-﻿namespace DataCommander
+﻿namespace DataCommander.Update.Events
 {
     public abstract class Event
     {
diff --git a/DataCommander/Update/Events/NewVersionDownloaded.cs b/DataCommander/Update/Events/NewVersionDownloaded.cs
@@ -1,4 +1,4 @@
-﻿namespace DataCommander
+﻿namespace DataCommander.Update.Events
 {
     public sealed class NewVersionDownloaded : Event
     {
diff --git a/DataCommander/Update/Updater.cs b/DataCommander/Update/Updater.cs
@@ -2,10 +2,11 @@
 using System.IO;
 using System.Reflection;
 using System.Threading.Tasks;
+using DataCommander.Update.Events;
 using Foundation;
 using Foundation.Deployment;
 
-namespace DataCommander
+namespace DataCommander.Update
 {
     public sealed class Updater
     {
@@ -26,24 +27,24 @@ private async Task Handle(CheckForUpdates checkForUpdates)
             if (checkForUpdates.When <= UniversalTime.Default.UtcNow)
             {
                 var localVersion = Assembly.GetEntryAssembly().GetName().Version;
-                var remoteVersionUri = new Uri("https://raw.githubusercontent.com/csbernath/DataCommander/master/DataCommander/Version.txt");
+                var remoteVersionUri = new Uri("https://raw.githubusercontent.com/csbernath/DataCommander/master/Version.txt");
                 _eventPublisher(new CheckForUpdatesStarted());
-                var remoteVersion = await DeploymentApplication.GetRemoteVersion(remoteVersionUri);
+                var remoteVersion = await DeploymentHelper.GetRemoteVersion(remoteVersionUri);
                 if (localVersion < remoteVersion)
                 {
                     _eventPublisher(new DownloadingNewVersionStarted());
                     var address = new Uri($"https://github.com/csbernath/DataCommander/releases/download/{remoteVersion}/DataCommander.Updater.zip");
                     var guid = Guid.NewGuid();
                     var updaterDirectory = Path.Combine(Path.GetTempPath(), guid.ToString());
                     var zipFileName = Path.Combine(updaterDirectory, "Updater.zip");
-                    await DeploymentApplication.DownloadUpdater(address, updaterDirectory, zipFileName,
+                    await DeploymentHelper.DownloadUpdater(address, updaterDirectory, zipFileName,
                         args => _eventPublisher(new DownloadProgressChanged(args)));
                     _eventPublisher(new NewVersionDownloaded());
-                    DeploymentApplication.ExtractZip(zipFileName, updaterDirectory);
+                    DeploymentHelper.ExtractZip(zipFileName, updaterDirectory);
 
                     var updaterExeFileName = Path.Combine(updaterDirectory, "DataCommander.Updater.exe");
                     var applicationExeFileName = Assembly.GetEntryAssembly().Location;
-                    DeploymentApplication.StartUpdater(updaterExeFileName, applicationExeFileName);
+                    DeploymentHelper.StartUpdater(updaterExeFileName, applicationExeFileName);
                     _updateStarted = true;
                 }
                 else
@@ -59,7 +60,7 @@ await DeploymentApplication.DownloadUpdater(address, updaterDirectory, zipFileNa
 
         private Task Handle(DeleteUpdater deleteUpdater)
         {
-            DeploymentApplication.DeleteUpdater(deleteUpdater.Directory);
+            DeploymentHelper.DeleteUpdater(deleteUpdater.Directory);
             return Task.CompletedTask;
         }
     }
diff --git a/DataCommander/Update/UpdaterForm.Designer.cs b/DataCommander/Update/UpdaterForm.Designer.cs
diff --git a/DataCommander/Update/UpdaterForm.cs b/DataCommander/Update/UpdaterForm.cs
@@ -2,7 +2,7 @@
 using System.Windows.Forms;
 using Foundation;
 
-namespace DataCommander
+namespace DataCommander.Update
 {
     public partial class UpdaterForm : Form
     {
diff --git a/DataCommander/Update/UpdaterForm.resx b/DataCommander/Update/UpdaterForm.resx
diff --git a/DataCommander/Version.txt b/DataCommander/Version.txt
diff --git a/Foundation.NetStandard-2.0/Deployment/DeploymentHelper.cs b/Foundation.NetStandard-2.0/Deployment/DeploymentHelper.cs
@@ -7,8 +7,10 @@
 
 namespace Foundation.Deployment
 {
-    public static class DeploymentApplication
+    public static class DeploymentHelper
     {
+        private const string ApplicationName = "DataCommander";
+
         public static async Task<Version> GetRemoteVersion(Uri address)
         {
             string text;
@@ -50,28 +52,47 @@ public static async Task DownloadUpdater(Uri address, string updaterDirectory, s
             }
         }
 
-        public static void ExtractZip(string zipFileName, string updaterDirectory)
+        public static void ExtractZip(string sourceArchiveFileName, string destinationDirectoryName)
         {
-            ZipFile.ExtractToDirectory(zipFileName, updaterDirectory);
-            File.Delete(zipFileName);
+            ZipFile.ExtractToDirectory(sourceArchiveFileName, destinationDirectoryName);
+            File.Delete(sourceArchiveFileName);
         }
 
         public static void StartUpdater(string updaterExeFileName, string applicationExeFileName)
         {
             var processStartInfo = new ProcessStartInfo();
             processStartInfo.FileName = updaterExeFileName;
+            processStartInfo.WorkingDirectory = Path.GetDirectoryName(updaterExeFileName);
             processStartInfo.Arguments = $"{Quote(applicationExeFileName)}";
             Process.Start(processStartInfo);
         }
 
-        private static string Quote(string text)
+        public static void Update(string updaterDirectory, string applicationExeFileName)
         {
-            return $"\"{text}\"";
+            var applicationDirectory = Path.GetDirectoryName(applicationExeFileName);
+            var backupDirectory = $"{applicationDirectory}.Backup";
+
+            Directory.Move(applicationDirectory, backupDirectory);
+            Directory.Move(updaterDirectory, applicationDirectory);
+            Directory.Delete(backupDirectory);
+
+            DeploymentCommandRepository.Save(ApplicationName, new DeleteUpdater { Directory = updaterDirectory });
+
+            var processStartInfo = new ProcessStartInfo();
+            processStartInfo.WorkingDirectory = applicationDirectory;
+            processStartInfo.FileName = applicationExeFileName;
+            processStartInfo.Arguments = applicationDirectory;
+            Process.Start(processStartInfo);
         }
 
         public static void DeleteUpdater(string updaterDirectory)
         {
             Directory.Delete(updaterDirectory, true);
         }
+
+        private static string Quote(string text)
+        {
+            return $"\"{text}\"";
+        }
     }
 }
diff --git a/Foundation.NetStandard-2.0/Deployment/Updater.cs b/Foundation.NetStandard-2.0/Deployment/Updater.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace DataCommander`
	`1`	`+namespace DataCommander.Update.Events`
`2`	`2`	`{`
`3`	`3`	`public sealed class CheckForUpdateCompleted : Event`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Net;`
`2`	`2`
`3`		`-namespace DataCommander`
	`3`	`+namespace DataCommander.Update.Events`
`4`	`4`	`{`
`5`	`5`	`public sealed class DownloadProgressChanged : Event`
`6`	`6`	`{`