Skip to content

Commit

Permalink
Merge branch 'release/1.1.20'
Browse files Browse the repository at this point in the history
* release/1.1.20:
  Update version_check.php
  Update changelog
  Switch from Ssl 3.0 | Tls 1.0 | Tls 1.1 to Tls 1.0 | Tls 1.1 | Tls 1.2
  Fix problem with version_check.php
  • Loading branch information
canton7 committed Feb 28, 2018
2 parents 4e0e9eb + 0f198de commit 7a1b72c
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 8 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changelog
=========

v1.1.20
-------

- Fix to allow SyncTrayzor to download updates from GitHub, after they made changes

v1.1.19
-------

Expand Down
19 changes: 11 additions & 8 deletions server/version_check.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,28 +64,31 @@ function get_with_wildcard($src, $value, $default = null)
return $default;
}

$base = "https://synctrayzor.antonymale.co.uk/download";

$versions = [
'1.1.19' => [
'1.1.20' => [
'installed' => [
'direct_download_url' => [
'x64' => 'https://github.com/canton7/SyncTrayzor/releases/download/v{version}/SyncTrayzorSetup-x64.exe',
'x86' => 'https://github.com/canton7/SyncTrayzor/releases/download/v{version}/SyncTrayzorSetup-x86.exe',
'x64' => "$base/v{version}/SyncTrayzorSetup-x64.exe",
'x86' => '$base/v{version}/SyncTrayzorSetup-x86.exe',
],
],
'portable' => [
'direct_download_url' => [
'x64' => 'https://github.com/canton7/SyncTrayzor/releases/download/v{version}/SyncTrayzorPortable-x64.zip',
'x86' => 'https://github.com/canton7/SyncTrayzor/releases/download/v{version}/SyncTrayzorPortable-x86.zip',
'x64' => "$base/v{version}/SyncTrayzorPortable-x64.zip",
'x86' => "$base/v{version}/SyncTrayzorPortable-x86.zip",
],
],
'sha1sum_download_url' => 'https://github.com/canton7/SyncTrayzor/releases/download/v{version}/sha1sum.txt.asc',
'sha512sum_download_url' => 'https://github.com/canton7/SyncTrayzor/releases/download/v{version}/sha512sum.txt.asc',
'sha1sum_download_url' => "$base/v{version}/sha1sum.txt.asc",
'sha512sum_download_url' => "$base/v{version}/sha512sum.txt.asc",
'release_page_url' => 'https://github.com/canton7/SyncTrayzor/releases/tag/v{version}',
'release_notes' => "- Disable the built-in filesystem watcher if Syncthing's watcher is enabled\n- Retry starting Syncthing if it crashed (#421)\n- Make it clearer that multiple items in the Conflict Resolver window can be selected at once (#359)\n- Expose the setting to change the location of syncthing.exe (#386)\n- Fix issue where "Syncthing is starting" would appear forever (#420)\n- Fix crash when pausing/unpausing devices (#435)\n- Fix a rare condition when trying to enable auto-start would crash (#407)\n- Remove support for debug facilities, since Syncthing has this built in",
'release_notes' => "!!!!!\nYou must upgrade to v1.1.20 now, otherwise auto-upgrades will stop working!\n!!!!!\n\n- Fix to allow SyncTrayzor to download updates from GitHub, after they made changes\n- Disable the built-in filesystem watcher if Syncthing's watcher is enabled\n- Retry starting Syncthing if it crashed (#421)\n- Make it clearer that multiple items in the Conflict Resolver window can be selected at once (#359)\n- Expose the setting to change the location of syncthing.exe (#386)\n- Fix issue where \"Syncthing is starting\" would appear forever (#420)\n- Fix crash when pausing/unpausing devices (#435)\n- Fix a rare condition when trying to enable auto-start would crash (#407)\n- Remove support for debug facilities, since Syncthing has this built in",
]
];

$upgrades = [
'1.1.19' => ['to' => 'latest', 'formatter' => '5'],
'1.1.18' => ['to' => 'latest', 'formatter' => '5'],
'1.1.17' => ['to' => 'latest', 'formatter' => '5'],
'1.1.16' => ['to' => 'latest', 'formatter' => '5'],
Expand Down
5 changes: 5 additions & 0 deletions src/SyncTrayzor/Bootstrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
using System.Reflection;
using SyncTrayzor.Localization;
using SyncTrayzor.Services.Ipc;
using System.Net;

namespace SyncTrayzor
{
Expand Down Expand Up @@ -86,6 +87,10 @@ protected override void ConfigureIoC(IStyletIoCBuilder builder)

protected override void Configure()
{
// GitHub uses Tls 1.2 only, and it isn't enabled by default before .NET 4.6. Since we target an earlier
// .NET version, we have to enable this ourselves.
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12;

this.options = this.Container.Get<CommandLineOptionsParser>();
if (!this.options.Parse(this.Args))
Environment.Exit(0);
Expand Down

0 comments on commit 7a1b72c

Please sign in to comment.