AppUpdater throw error if UpdateUrl in publish.json was empty string

ClubNation · Dec 19, 2020 · 4a7e934 · 4a7e934
1 parent 159f5f4
commit 4a7e934
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Pub/PublishApp.ps1 b/Pub/PublishApp.ps1
@@ -72,10 +72,7 @@ if (-not $noclean)
     dotnet clean "$projectDir" -c "Release" --output $outDir 
 }
 dotnet publish "$projectDir" -c "Release" --output $outDir --framework net5.0 --no-self-contained /p:Version=$versionParam
-if ($LASTEXITCODE -gt 0)
-{
-    Throw "The publish exited with error code: " + $lastexitcode;
-}
+if ($LASTEXITCODE -gt 0) { Throw "The publish exited with error code: " + $lastexitcode; }
 
 #####
 # create zip package

diff --git a/Pub/Version.json b/Pub/Version.json
diff --git a/VpnHood.Common/AppUpdater.cs b/VpnHood.Common/AppUpdater.cs
@@ -53,7 +53,7 @@ public AppUpdater(string appFolder = null, AppUpdaterOptions options = null)
                 PublishInfo = JsonSerializer.Deserialize<PublishInfo>(File.ReadAllText(PublishInfoPath));
 
                 //set update Url by PublishInfo if it is not overwrited by parameter
-                if (UpdateUri == null && PublishInfo.UpdateUrl != null)
+                if (UpdateUri == null && !string.IsNullOrEmpty(PublishInfo.UpdateUrl))
                     UpdateUri = new Uri(PublishInfo.UpdateUrl);
             }
         }
@@ -172,6 +172,9 @@ private void CheckUpdateOffline()
 
         private async Task DownloadUpdate(PublishInfo publishInfo)
         {
+            if (string.IsNullOrEmpty(publishInfo.PackageDownloadUrl))
+                throw new Exception($"Could not find : {nameof(publishInfo.PackageDownloadUrl)}");
+
             // open source stream from net
             using var httpClient = new HttpClient { Timeout = TimeSpan.FromMilliseconds(10000) };
             using var srcStream = await httpClient.GetStreamAsync(publishInfo.PackageDownloadUrl);

diff --git a/VpnHood.Server.App.NetCore/_publish.ps1 b/VpnHood.Server.App.NetCore/_publish.ps1
@@ -2,7 +2,6 @@ $packageName = "VpnHoodServer";
 
 . "$PSScriptRoot\..\Pub\PublishApp.ps1" `
 	$PSScriptRoot -withLauncher `
-	-packageName "$packageName" `
+	-packageName $packageName `
 	-updateUrl "https://github.com/vpnhood/VpnHood/releases/latest/download/$packageName.json" `
-	-packageDownloadUrl "https://github.com/vpnhood/VpnHood/releases/latest/download/$packageName.zip" `
-
+	-packageDownloadUrl "https://github.com/vpnhood/VpnHood/releases/latest/download/$packageName.zip"
diff --git a/VpnHood.sln b/VpnHood.sln
@@ -40,6 +40,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pub", "Pub", "{AD60711B-C6D
 		Pub\PublishApps.ps1 = Pub\PublishApps.ps1
 		Pub\PublishNuget.ps1 = Pub\PublishNuget.ps1
 		Pub\PublishNugets.ps1 = Pub\PublishNugets.ps1
+		..\VpnHood.wiki\Version-History.md = ..\VpnHood.wiki\Version-History.md
 		Pub\Version.json = Pub\Version.json
 	EndProjectSection
 EndProject