Skip to content

Commit c33e551

Browse files
committed
related to #202 #595 #596
1 parent f4c8c38 commit c33e551

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

Analogy/Analogy.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
<None Remove="App.config" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' " />
4545
</ItemGroup>
4646
<ItemGroup>
47-
<PackageReference Include="Analogy.CommonUtilities" Version="1.3.3" />
48-
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="2.7.8" />
49-
<PackageReference Include="Analogy.LogViewer.Template" Version="1.6.7" />
47+
<PackageReference Include="Analogy.CommonUtilities" Version="1.3.6" />
48+
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="2.7.9.3" />
49+
<PackageReference Include="Analogy.LogViewer.Template" Version="1.6.9" />
5050
<PackageReference Include="MessagePack" Version="2.2.60" />
5151
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
5252
<PackageReference Include="System.IO.Compression" Version="4.3.0" />

Analogy/Forms/UpdateForm.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ private async void sbtnUpdateNow_Click(object sender, EventArgs e)
5858
if (File.Exists(Updater.UpdaterExecutable))
5959
{
6060
var processStartInfo = new ProcessStartInfo();
61-
var info = Updater.UpdateInformation;
62-
string data = $"\"{info.Title}\" {info.DownloadURL}";
61+
var info = Updater.DownloadInformation;
62+
string data = $"\"{info.title}\" {info.DownloadURL}";
6363
processStartInfo.Arguments = data;
6464
processStartInfo.Verb = "runas";
6565
processStartInfo.FileName = Updater.UpdaterExecutable;

Analogy/Managers/UpdateManager.cs

+3-10
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using System.Runtime.Versioning;
1414
using System.Threading.Tasks;
1515
using System.Windows.Forms;
16+
using Analogy.LogViewer.Template.IAnalogy;
1617

1718
namespace Analogy.Managers
1819
{
@@ -95,15 +96,13 @@ public bool NewVersionExist
9596
}
9697
}
9798

98-
public AnalogyDownloadInformation UpdateInformation
99+
public (string title,string DownloadURL) DownloadInformation
99100
{
100101
get
101102
{
102-
string tag = "";
103103
string downloadTag = "";
104104
if (!string.IsNullOrEmpty(Settings.LastVersionChecked?.TagName))
105105
{
106-
tag = $"tag/{Settings.LastVersionChecked?.TagName}";
107106
downloadTag = $"https://github.com/Analogy-LogViewer/Analogy.LogViewer/releases/download/{Settings.LastVersionChecked?.TagName}";
108107
var downloadAsset = GetDownloadAsset();
109108
if (downloadAsset != null)
@@ -112,13 +111,7 @@ public AnalogyDownloadInformation UpdateInformation
112111
}
113112

114113
}
115-
AnalogyDownloadInformation updateInfo = new AnalogyDownloadInformation
116-
("Analogy Log viewer", NewVersionExist,
117-
downloadTag,
118-
$"https://github.com/Analogy-LogViewer/Analogy.LogViewer/releases/{tag}",
119-
NewestVersion.ToString(), CurrentVersionNumber, false,
120-
Interfaces.UpdateMode.Normal, "", "", "");
121-
return updateInfo;
114+
return ("Analogy Log viewer", downloadTag);
122115
}
123116
}
124117

0 commit comments

Comments
 (0)