Updates to upgrade process

Author: rxtur

build/build.cake

@@ -23,6 +23,10 @@ Task("Build").IsDependentOn("Clean").Does(() =>
 	}
 
 	CopyFileToDirectory("../plugins/Common/bin/Release/netcoreapp2.1/Common.dll", "./publish");
+
+	CopyFileToDirectory("../src/Upgrade/bin/Release/netcoreapp2.1/Upgrade.dll", "./publish");
+	CopyFileToDirectory("../src/Upgrade/bin/Release/netcoreapp2.1/Upgrade.deps.json", "./publish");
+	CopyFileToDirectory("../src/Upgrade/bin/Release/netcoreapp2.1/Upgrade.runtimeconfig.json", "./publish");
 });
 
 Task("Test").IsDependentOn("Build").Does(() =>

src/App/App.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
-    <MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
+    <MvcRazorCompileOnPublish>false</MvcRazorCompileOnPublish>
   </PropertyGroup>
 
   <ItemGroup>
@@ -36,8 +36,10 @@
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <PropertyGroup>
       <PluginBaseDir>$(SolutionDir)plugins\Common\</PluginBaseDir>
+      <UpgradeBaseDir>$(SolutionDir)src\Upgrade\</UpgradeBaseDir>
     </PropertyGroup>
     <Copy SourceFiles="$(PluginBaseDir)\bin\$(Configuration)\$(TargetFramework)\Common.dll" DestinationFolder="$(TargetDir)" Condition="Exists('$(PluginBaseDir)bin\$(Configuration)\$(TargetFramework)\Common.dll')" />
+    <Copy SourceFiles="$(UpgradeBaseDir)\bin\$(Configuration)\$(TargetFramework)\Upgrade.dll" DestinationFolder="$(TargetDir)" Condition="Exists('$(UpgradeBaseDir)bin\$(Configuration)\$(TargetFramework)\Upgrade.dll')" />
   </Target>
 
 </Project>

src/App/Pages/Admin/Upgrade/Index.cshtml.cs

@@ -1,49 +1,50 @@
-using Microsoft.AspNetCore.Hosting;
+using Core.Services;
+using Microsoft.AspNetCore.Hosting;
 using System;
 using System.Diagnostics;
+using System.Threading.Tasks;
 
 namespace App.Pages.Admin.Upgrade
 {
     public class UpgradeModel : AdminPageModel
     {
-        private IApplicationLifetime ApplicationLifetime { get; set; }
+        private IApplicationLifetime _app;
+        private IWebService _ws;
 
         public bool IsUpgrading = false;
 
-        public UpgradeModel(IApplicationLifetime appLifetime)
+        public UpgradeModel(IApplicationLifetime app, IWebService ws)
         {
-            ApplicationLifetime = appLifetime;
+            _app = app;
+            _ws = ws;
         }
 
         public void OnGet()
         {
             // check for newer version
         }
 
-        public void OnPost()
+        public async Task OnPost()
         {
             IsUpgrading = true;
 
-            // Download new version
-            //string zipPath = @"c:\demo\foo.zip";
-            //string extractPath = @"c:\demo\extract";
-            //ZipFile.ExtractToDirectory(zipPath, extractPath);
-
-            // start upgrade process
-            //Process p = new Process();
-            //p.StartInfo.FileName = "dotnet";
-            //p.StartInfo.Arguments = "Upgrade.dll";
-            //p.StartInfo.UseShellExecute = false;
-            //p.StartInfo.CreateNoWindow = false;
-            //p.Start();
-
-            ApplicationLifetime.StopApplication();
-
-            //Program.Main(null);
-
-            //Process.GetCurrentProcess().Kill();
-            //Environment.Exit(0);
-            //Program.Shutdown();
+            if (string.IsNullOrEmpty(await _ws.DownloadLatestRelease()))
+            {
+                // start upgrade process
+                //Process p = new Process();
+                //p.StartInfo.FileName = "dotnet";
+                //p.StartInfo.Arguments = "Upgrade.dll";
+                //p.StartInfo.UseShellExecute = false;
+                //p.StartInfo.CreateNoWindow = false;
+                //p.Start();
+
+                //_app.StopApplication();
+
+                //Program.Main(null);
+                //Process.GetCurrentProcess().Kill();
+                //Environment.Exit(0);
+                //Program.Shutdown();
+            }
         }
     }
 }

src/Core/Services/NotificationService.cs

@@ -15,15 +15,14 @@ public interface INotificationService
 
     public class NotificationService : INotificationService
     {
-        static DateTime _lastChecked;
+        static DateTime _checkPoint;
         IDataService _db;
         IWebService _web;
 
         public NotificationService(IDataService db, IWebService web)
         {
             _db = db;
             _web = web;
-            _lastChecked = SystemClock.Now();
         }
 
         public async Task<int> AddNotification(AlertType aType, int authorId, string notifier, string content)
@@ -47,9 +46,9 @@ public async Task<int> AddNotification(AlertType aType, int authorId, string not
 
         public async Task<IEnumerable<Notification>> GetNotifications(int authorId)
         {
-            if(SystemClock.Now() >= _lastChecked)
+            if(SystemClock.Now() >= _checkPoint)
             {
-                _lastChecked = SystemClock.Now().AddMinutes(10);
+                _checkPoint = SystemClock.Now().AddMinutes(30);
                 var result = await _web.CheckForLatestRelease();
 
                 if (!string.IsNullOrEmpty(result))

src/Core/Services/WebService.cs

@@ -1,17 +1,21 @@
-using System.Net.Http;
+using System.IO;
+using System.IO.Compression;
+using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace Core.Services
 {
     public interface IWebService
     {
         Task<string> CheckForLatestRelease();
+        Task<string> DownloadLatestRelease();
     }
 
     public class WebService : IWebService
     {
         IDataService _db;
         static HttpClient client = new HttpClient();
+        static string _repoUrl = "https://api.github.com/repos/blogifierdotnet/Blogifier/releases/latest";
 
         public WebService(IDataService db)
         {
@@ -27,9 +31,8 @@ public WebService(IDataService db)
         public async Task<string> CheckForLatestRelease()
         {
             string result = "";
-            var url = "https://api.github.com/repos/blogifierdotnet/Blogifier/releases/latest";
+            HttpResponseMessage response = await client.GetAsync(_repoUrl);
 
-            HttpResponseMessage response = await client.GetAsync(url);
             if (response.IsSuccessStatusCode)
             {
                 var repo = await response.Content.ReadAsAsync<Data.Github.Repository>();
@@ -48,5 +51,45 @@ public async Task<string> CheckForLatestRelease()
 
             return await Task.FromResult(result);
         }
+
+        public async Task<string> DownloadLatestRelease()
+        {
+            var uloadDir = "_upgrade";
+            var msg = "";
+            try
+            {
+                HttpResponseMessage response = await client.GetAsync(_repoUrl);
+                if (response.IsSuccessStatusCode)
+                {
+                    var repo = await response.Content.ReadAsAsync<Data.Github.Repository>();
+                    var zipUrl = repo.assets[0].browser_download_url;
+                    var zipPath = $"{uloadDir}{Path.DirectorySeparatorChar.ToString()}{repo.tag_name}.zip";
+
+                    using (var client = new HttpClient())
+                    {
+                        using (var result = await client.GetAsync(zipUrl))
+                        {
+                            if (result.IsSuccessStatusCode)
+                            {
+                                var zipBites = await result.Content.ReadAsByteArrayAsync();
+
+                                if (!Directory.Exists(uloadDir))
+                                    Directory.CreateDirectory(uloadDir);
+
+                                File.WriteAllBytes(zipPath, zipBites);
+
+                                ZipFile.ExtractToDirectory(zipPath, uloadDir);
+                            }
+                        }
+                    }
+                }
+            }
+            catch (System.Exception ex)
+            {
+                msg = ex.Message;
+            }
+
+            return await Task.FromResult(msg);
+        }
     }
 }

src/Upgrade/Program.cs

@@ -16,24 +16,31 @@ class Program
         static void Main(string[] args)
         {
             _appDir = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-            _upgDir = $"{_appDir}{_slash}upgrade";
+            _upgDir = $"{_appDir}{_slash}_upgrade";
             _items = new List<string>();
 
             _items.Add($"STARTING UPGRADE IN: {_appDir}");
 
             // wait for web app to stop
             System.Threading.Thread.Sleep(3000);
 
-            var files = Directory.GetFiles(_appDir);
+            try
+            {
+                var files = Directory.GetFiles(_appDir);
 
-            foreach (var file in GetCoreFiles())
+                foreach (var file in GetCoreFiles())
+                {
+                    ReplaceFile(file);
+                }
+
+                ReplaceFolder($"wwwroot{_slash}admin");
+                ReplaceFolder($"wwwroot{_slash}lib");
+            }
+            catch (Exception ex)
             {
-                ReplaceFile(file);
+                _items.Add(ex.Message);
             }
 
-            ReplaceFolder($"wwwroot{_slash}admin");
-            ReplaceFolder($"wwwroot{_slash}lib");
-
             using (StreamWriter writer = new StreamWriter("upgrade.log"))
             {
                 foreach (var item in _items)
@@ -100,8 +107,6 @@ static List<string> GetCoreFiles()
                 "App.deps.json",
                 "App.dll",
                 "App.pdb",
-                "App.PrecompiledViews.dll",
-                "App.PrecompiledViews.pdb",
                 "App.runtimeconfig.json",
                 "Common.dll",
                 "Core.dll",