Skip to content

Commit e5868c8

Browse files
committed
Add x64 update file
1 parent 3990a78 commit e5868c8

6 files changed

Lines changed: 42 additions & 8 deletions

File tree

SimpleDnsCrypt.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1111
LICENSE.md = LICENSE.md
1212
README.md = README.md
1313
update.yml = update.yml
14+
update64.yml = update64.yml
1415
EndProjectSection
1516
EndProject
1617
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Uninstall", "Uninstall\Uninstall.csproj", "{70BFF12B-996D-43F0-8529-CF8711699ACB}"

SimpleDnsCrypt/Config/Global.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ public static class Global
1616
public const string ApplicationUpdateUri =
1717
"https://raw.githubusercontent.com/bitbeans/SimpleDnsCrypt/master/update.yml";
1818

19+
/// <summary>
20+
/// Remote URI where the application will find the update informations.
21+
/// </summary>
22+
public const string ApplicationUpdateUri64 =
23+
"https://raw.githubusercontent.com/bitbeans/SimpleDnsCrypt/master/update64.yml";
24+
1925
/// <summary>
2026
/// The public key to validate the installer.
2127
/// </summary>

SimpleDnsCrypt/Tools/ApplicationUpdater.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ public static async Task<RemoteUpdate> CheckForRemoteUpdateAsync()
2020
var currentVersion = Assembly.GetExecutingAssembly().GetName().Version;
2121

2222
remoteUpdate.CanUpdate = false;
23-
var remoteUpdateData = await DownloadRemoteUpdateFileAsync().ConfigureAwait(false);
23+
var remoteUpdateFile = (Environment.Is64BitProcess) ? Global.ApplicationUpdateUri64 : Global.ApplicationUpdateUri;
24+
var remoteUpdateData = await DownloadRemoteUpdateFileAsync(remoteUpdateFile).ConfigureAwait(false);
2425

2526
if (remoteUpdateData != null)
2627
{
@@ -62,11 +63,11 @@ public static async Task<RemoteUpdate> CheckForRemoteUpdateAsync()
6263
return remoteUpdate;
6364
}
6465

65-
private static async Task<byte[]> DownloadRemoteUpdateFileAsync()
66+
private static async Task<byte[]> DownloadRemoteUpdateFileAsync(string remoteUpdateFile)
6667
{
6768
using (var client = new HttpClient())
6869
{
69-
var getDataTask = client.GetByteArrayAsync(Global.ApplicationUpdateUri);
70+
var getDataTask = client.GetByteArrayAsync(remoteUpdateFile);
7071
return await getDataTask.ConfigureAwait(false);
7172
}
7273
}

SimpleDnsCrypt/Tools/VersionUtilities.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,20 @@ public static string PublishVersion
3030
}
3131
}
3232
}
33-
}
33+
34+
public static string PublishBuild
35+
{
36+
get
37+
{
38+
if (Environment.Is64BitProcess)
39+
{
40+
return ("(x64)");
41+
}
42+
else
43+
{
44+
return ("(x32)");
45+
}
46+
}
47+
}
48+
}
3449
}

SimpleDnsCrypt/ViewModels/MainViewModel.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@ private MainViewModel(IWindowManager windowManager, IEventAggregator eventAggreg
109109
}
110110
if (_userData.UseIpv6)
111111
{
112-
DisplayName = string.Format("{0} {1}", Global.ApplicationName, VersionUtilities.PublishVersion);
112+
DisplayName = string.Format("{0} {1} {2}", Global.ApplicationName, VersionUtilities.PublishVersion, VersionUtilities.PublishBuild);
113113
}
114114
else
115115
{
116-
DisplayName = string.Format("{0} {1} ({2})", Global.ApplicationName, VersionUtilities.PublishVersion,
116+
DisplayName = string.Format("{0} {1} {2} ({3})", Global.ApplicationName, VersionUtilities.PublishVersion, VersionUtilities.PublishBuild,
117117
LocalizationEx.GetUiString("global_ipv6_disabled", Thread.CurrentThread.CurrentCulture));
118118
}
119119

@@ -318,11 +318,11 @@ public Language SelectedLanguage
318318
_userData.SaveConfigurationFile();
319319
if (_userData.UseIpv6)
320320
{
321-
DisplayName = string.Format("{0} {1}", Global.ApplicationName, VersionUtilities.PublishVersion);
321+
DisplayName = string.Format("{0} {1} {2}", Global.ApplicationName, VersionUtilities.PublishVersion, VersionUtilities.PublishBuild);
322322
}
323323
else
324324
{
325-
DisplayName = string.Format("{0} {1} ({2})", Global.ApplicationName, VersionUtilities.PublishVersion,
325+
DisplayName = string.Format("{0} {1} {2} ({3})", Global.ApplicationName, VersionUtilities.PublishVersion, VersionUtilities.PublishBuild,
326326
LocalizationEx.GetUiString("global_ipv6_disabled", Thread.CurrentThread.CurrentCulture));
327327
}
328328
if (_actAsGlobalGateway)

update64.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
update:
2+
version: 0.4.2
3+
type: 0
4+
release: 2017-03-04
5+
publickey: RWTSM+4BNNvkZPNkHgE88ETlhWa+0HDzU5CN8TvbyvmhVUcr6aQXfssV
6+
installer:
7+
uri: https://github.com/bitbeans/SimpleDnsCrypt/releases/download/0.4.2/SimpleDNSCrypt64.msi
8+
name: SimpleDNSCrypt64.msi
9+
signature:
10+
uri: https://github.com/bitbeans/SimpleDnsCrypt/releases/download/0.4.2/SimpleDNSCrypt64.msi.minisig
11+

0 commit comments

Comments
 (0)