Changed Updates System

Author: SoDeRMond

ILMergeUI/ILMergeUI.csproj

@@ -70,6 +70,7 @@
 			<SpecificVersion>False</SpecificVersion>
 			<HintPath>ResourcesData\Libraries\Octokit.dll</HintPath>
 		</Reference>
+		<Reference Include="System.IO.Compression.FileSystem" />
 		<Reference Include="System.Windows.Forms" />
 		<Reference Include="System.Text.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" />
 		<Reference Include="System.Drawing" />

ILMergeUI/ResourcesData/Forms/Home.cs

@@ -48,7 +48,7 @@ private async void Program_Update()
 			else
 			{
 				if (Classes.Class_SavedData.Int_AutoProgramUpdates == 0)
-				{ Update_Download(); }
+				{ Update_DownloadAndRun(); }
 
 				else
 				{
@@ -71,11 +71,11 @@ private void Content_Scroll(int Int_MouseDelta)
 			{ HtmlLabel_Content.Top -= 36; }
 		}
 
-		private async void Update_Download()
+		private async void Update_DownloadAndRun()
 		{
 			Translate_Get($"{_UpdateStatus}DownloadingUpdate", string.Empty);
 
-			try { await Classes.Class_UpdatesManager.Update_Download(); }
+			try { await Classes.Class_UpdatesManager.Update_DownloadAndRun(); }
 			catch { Program_Update(); }
 		}
 
@@ -86,10 +86,7 @@ private void HtmlLabel_Content_MouseWheel(object Object_Label, MouseEventArgs Mo
 		{ Content_Scroll(MouseEventArgs_MouseWheel.Delta); }
 
 		private void Button_DownloadAndRun_Click(object Object_Button, EventArgs EventArgs_Click)
-		{
-			Update_Download();
-			Classes.Class_UpdatesManager.Update_Run();
-		}
+		{ Update_DownloadAndRun(); }
 
 		private void LinkLabel_GitHub_LinkClicked(object Object_LinkLabel, LinkLabelLinkClickedEventArgs LinkLabelLinkClickedEventArgs_LinkClicked)
 		{ Process.Start($"https://github.com/{Application.CompanyName}/{Application.ProductName}".Replace(" ", string.Empty)); }

ILMergeUI/ResourcesData/Source/Controllers/UpdatesController.cs

@@ -1,8 +1,10 @@
 using ILMergeUI.ResourcesData.Source.Root;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using System.IO.Compression;
 using System.Linq;
 using System.Net;
+using System.IO;
 using Octokit;
 
 namespace ILMergeUI.ResourcesData.Source.Controllers
@@ -11,14 +13,15 @@ public class UpdatesController
 	{
 		private readonly string String_CurrentVersion = Classes.Class_AdditionalMethods.Symbols_Remove(System.Windows.Forms.Application.ProductVersion);
 
-		private readonly string String_ExecutablePath = System.Windows.Forms.Application.ExecutablePath;
 		private readonly string String_CompanyName = System.Windows.Forms.Application.CompanyName;
 		private readonly string String_ProductName = System.Windows.Forms.Application.ProductName.Replace(" ", string.Empty);
 
 
 		private GitHubClient GitHubClient_Update;
 		public Release Release_Latest;
 
+		private string String_LatestVersion;
+
 
 		private async Task<bool> Version_Check()
 		{
@@ -43,14 +46,29 @@ public async Task Update_Download()
 			ReleaseAsset ReleaseAsset_Latest = ReleaseAsset_All.FirstOrDefault();
 
 			using (WebClient WebClient_Update = new WebClient())
-			{ WebClient_Update.DownloadFile(ReleaseAsset_Latest.BrowserDownloadUrl, $"{String_ProductName}_Latest.exe"); }
+			{ WebClient_Update.DownloadFile(ReleaseAsset_Latest.BrowserDownloadUrl, $"{String_ProductName}_Latest.zip"); }
+
+			Update_Run();
+		}
+
+		private string LatestVersion_Get()
+		{
+			int Int_Index = Release_Latest.TagName.IndexOf('v');
+			return (Int_Index == -1) ? Release_Latest.TagName : Release_Latest.TagName.Substring(Int_Index);
 		}
 
 		public void Update_Run()
 		{
+			string String_StartupDirectory = Path.GetDirectoryName(System.Windows.Forms.Application.StartupPath);
+			string String_OriginalProductName = System.Windows.Forms.Application.ProductName;
+
+			String_LatestVersion = LatestVersion_Get();
+			ZipFile.ExtractToDirectory($"{String_ProductName}_Latest.zip", String_StartupDirectory);
+
 			Classes.Class_AdditionalMethods.Process_Start
-				("CMD.exe", $"/C TaskKill /F /IM \"{String_ProductName}.exe\" && TimeOut /T 1 " +
-				$"&& Del \"{String_ExecutablePath}\" && Ren {String_ProductName}_Latest.exe \"{String_ProductName}.exe\" && \"{String_ExecutablePath}\"");
+				("CMD.exe", $"/C TaskKill /F /IM \"{String_ProductName}.exe\" && TimeOut /T 1 && Del /S /F /Q *.* " +
+				$"&& start CMD.exe /C Move /Y \"{String_StartupDirectory}\\{String_OriginalProductName} {String_LatestVersion}\\*.*\" . " +
+				$"&& TimeOut /T 1 && RMDir /S /Q \"{String_StartupDirectory}\\{String_OriginalProductName} {String_LatestVersion}\" && \"{String_OriginalProductName}.exe\"");
 		}
 	}
 }

ILMergeUI/ResourcesData/Source/Managers/UpdatesManager.cs

@@ -11,10 +11,7 @@ public Task<int> Status_Get()
 		public string Body_Get()
 		{ return Classes.Class_UpdatesController.Release_Latest.Body; }
 
-		public async Task Update_Download()
+		public async Task Update_DownloadAndRun()
 		{ await Classes.Class_UpdatesController.Update_Download(); }
-
-		public void Update_Run()
-		{ Classes.Class_UpdatesController.Update_Run(); }
 	}
 }