diff --git a/.gitmodules b/.gitmodules
index b2cfab3235cc522a260b24982357cb53279abf16..3648ccab9d34c4ab29cd6d1c55447205f12be238 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "winsparkle"]
- path = winsparkle
- url = git://github.com/vslavik/winsparkle.git
- ignore = dirty
[submodule "libqrencode"]
path = libqrencode
url = https://github.com/fukuchi/libqrencode.git
diff --git a/README.md b/README.md
index 4e3d261ca391a479d335bfd0712482de55011185..441da38123d3475a2db5b525c90b2099286231d6 100644
--- a/README.md
+++ b/README.md
@@ -30,17 +30,6 @@ For more information about the jami project, see the following:
TBD
-### Build winsparkle
-In the client directory after having initialized the submodule:
-
-```
-cd winsparkle
-mkdir build && cd build
-cmake -DCMAKE_TOOLCHAIN_FILE=<LRC Directory>/cmake/winBuild.cmake -DCMAKE_INSTALL_PREFIX=Install dir of Jami and LRC> ../cmake",
-make
-make install
-```
-
### Packaging
* Nsis : Nullsoft Scriptable Install System :http://nsis.sourceforge.net/Main_Page.
diff --git a/build-client.bat b/build-client.bat
index 9c206c0e2f976a39aec60f2aa826cf908bedb433..3e653fa6034c90cfc3514882a7b1cae5809ce391 100644
--- a/build-client.bat
+++ b/build-client.bat
@@ -93,11 +93,7 @@ goto Usage
:buildDeps
set TOBUILD=qrencode-win32\qrencode-win32\vc8\qrcodelib\qrcodelib.vcxproj
msbuild %TOBUILD% /verbosity:normal /p:Configuration=Release-Lib %MSBUILD_ARGS%
-set TOBUILD=winsparkle\WinSparkle-2015.sln
set WGET_CMD=wget --no-check-certificate --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --tries=4
-%WGET_CMD% https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
-nuget restore %TOBUILD%
-msbuild %TOBUILD% /verbosity:normal /p:Configuration=Release %MSBUILD_ARGS%
goto cleanup
:compileClient
diff --git a/copy-runtime-files.ps1 b/copy-runtime-files.ps1
index 3ae8873c83e73ea69df903c0282eae4295c80ccf..6cd10d670dcb5fdd2681a617e2d5ffbbca5e47d9 100644
--- a/copy-runtime-files.ps1
+++ b/copy-runtime-files.ps1
@@ -36,7 +36,6 @@ $FilesToCopy = @(
"$daemonDir\contrib\build\ffmpeg\Build\win32\x64\bin\avfilter-7.dll",
"$daemonDir\contrib\build\restbed\dependency\openssl\out32dll\libeay32.dll",
"$daemonDir\contrib\build\restbed\dependency\openssl\out32dll\ssleay32.dll",
- "$ClientDir\winsparkle\x64\Release\WinSparkle.dll",
"$ClientDir\ring.nsi",
"$ClientDir\images\jami.ico"
"$ClientDir\License.rtf"
diff --git a/fetch-deps.bat b/fetch-deps.bat
index 7a23abbadfc5c60a24773e85f5e86d9d82fed18d..4e6cfd379577b5473b365d9e696618fb4caee92c 100644
--- a/fetch-deps.bat
+++ b/fetch-deps.bat
@@ -9,28 +9,6 @@ if "%1" == "/c" (
set WGET_CMD=wget --no-check-certificate --retry-connrefused --waitretry=1 --read-timeout=20 --timeout=15 --tries=4
set APPLY_CMD=git apply --reject --ignore-whitespace --whitespace=fix
-if exist winsparkle (
- rmdir winsparkle /s /q
-)
-git clone https://github.com/vslavik/winsparkle.git
-cd winsparkle
-git checkout 6e7bb8554852d7f964fd176c440dd29cc772f2dc
-%APPLY_CMD% ..\winsparkle.patch
-if "%cloneSubmodules%" neq "N" (
- cd 3rdparty
-
- call :getTarballDepToFolder https://github.com/libexpat/libexpat 97c6bd01990090d4015364ae37dd141f3c39a30f expat
- call :getTarballDepToFolder https://github.com/openssl/openssl e5bba24cd8bb3e5127a578b85c6edf013a38ea6d openssl
- call :getTarballDepToFolder https://github.com/wxWidgets/wxWidgets 08ea09c7fee69984c75e51ea8ee90ef075f06e90 wxWidgets
-
- cd wxWidgets\3rdparty
- call :getTarballDepToFolder https://github.com/wxWidgets/Catch 011f6e6458d888246f94643e293f002073cff489 catch
- cd ..\..
-
- cd ..
-)
-cd ..
-
if exist qrencode-win32 (
rmdir qrencode-win32 /s /q
)
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 62976c823c4049d3fc7a1d28adf84b5bb09eea34..92a8d479c2c7e7af1b3041444d53c31068d0758d 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -31,7 +31,6 @@
#include "media/textrecording.h"
#ifdef Q_OS_WIN
-#include "winsparkle.h"
#include <QWinThumbnailToolBar>
#include <QWinThumbnailToolButton>
#include <windows.h>
@@ -117,19 +116,24 @@ MainWindow::MainWindow(QWidget* parent)
::AppendMenuW(sysMenu, MF_STRING, IDM_ABOUTBOX, aboutTitle.toStdWString().c_str());
}
- win_sparkle_set_appcast_url("https://dl.ring.cx/windows/winsparkle-ring.xml");
- win_sparkle_set_app_details(L"Savoir-faire Linux", L"Jami", QString(VERSION_STRING).toStdWString().c_str());
- win_sparkle_set_shutdown_request_callback([]() { QCoreApplication::exit(); });
- win_sparkle_set_did_find_update_callback([]() { MainWindow::instance().showWindow(); });
- win_sparkle_init();
-
- if (win_sparkle_get_last_check_time() == -1) {
- win_sparkle_set_update_check_interval(86400);
+ // check for updates and start automatic update check if needed
+ QSettings settings("jami.net", "Jami");
+ if (!settings.contains(SettingsKey::autoUpdate)) {
+ settings.setValue(SettingsKey::autoUpdate, true);
}
-
- QObject::connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, [=]() {
- win_sparkle_cleanup();
- });
+ if (settings.value(SettingsKey::autoUpdate).toBool()) {
+ Utils::checkForUpdates(false, this);
+ }
+ updateTimer_ = new QTimer(this);
+ connect(updateTimer_, &QTimer::timeout,
+ [this]() {
+ QSettings settings("jami.net", "Jami");
+ if (settings.value(SettingsKey::autoUpdate).toBool()) {
+ Utils::checkForUpdates(false, this);
+ }
+ });
+ long updateCheckDelay = 4 * 86400 * 1000;
+ updateTimer_->start(updateCheckDelay);
#endif
setContextMenuPolicy(Qt::NoContextMenu);
@@ -166,13 +170,6 @@ MainWindow::MainWindow(QWidget* parent)
lastScr_ = startScreen;
- // check for updates and start automatic update check
- Utils::checkForUpdates(false, this);
- updateTimer_ = new QTimer(this);
- connect(updateTimer_, &QTimer::timeout, [this]() { Utils::checkForUpdates(false, this); });
- long updateCheckDelay = 4 * 24 * 60 * 60 * 1000;
- updateTimer_->start(updateCheckDelay);
-
#ifdef DEBUG_STYLESHEET
QTimer *timer = new QTimer(this);
connect(timer, &QTimer::timeout,
diff --git a/ring-client-windows.vcxproj b/ring-client-windows.vcxproj
index 7698d99bca6a30f9a6b0c0c7e8132cce8341b153..c55c234711436020af446511e3212f4272b9cfb6 100644
--- a/ring-client-windows.vcxproj
+++ b/ring-client-windows.vcxproj
@@ -73,7 +73,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
- <AdditionalIncludeDirectories>.\GeneratedFiles\$(ConfigurationName);.\GeneratedFiles;.;$(ProjectDir)..\ring-daemon\contrib\msvc\include;$(ProjectDir)..\daemon\contrib\msvc\include;$(ProjectDir)..\ring-lrc\src;$(ProjectDir)..\lrc\src;$(ProjectDir)winsparkle\include;$(ProjectDir)qrencode-win32\qrencode-win32;$(QTDIR)\include;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtWinExtras;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtXml;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtCore;$(QTDIR)\mkspecs\win32-msvc;.\release;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>.\GeneratedFiles\$(ConfigurationName);.\GeneratedFiles;.;$(ProjectDir)..\ring-daemon\contrib\msvc\include;$(ProjectDir)..\daemon\contrib\msvc\include;$(ProjectDir)..\ring-lrc\src;$(ProjectDir)..\lrc\src;$(ProjectDir)qrencode-win32\qrencode-win32;$(QTDIR)\include;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtWinExtras;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtXml;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtCore;$(QTDIR)\mkspecs\win32-msvc;.\release;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -Zc:referenceBinding -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)</AdditionalOptions>
<AssemblerListingLocation>release\</AssemblerListingLocation>
<BrowseInformation>false</BrowseInformation>
@@ -96,8 +96,8 @@
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
- <AdditionalDependencies>dring.lib;qtwrapper.lib;ringclient_static.lib;WinSparkle.lib;qrcodelib.lib;shell32.lib;Ole32.lib;Advapi32.lib;Shlwapi.lib;User32.lib;Gdi32.lib;Crypt32.lib;Strmiids.lib;qtmain.lib;Qt5Svg.lib;Qt5Widgets.lib;Qt5WinExtras.lib;Qt5Gui.lib;Qt5Xml.lib;Qt5Network.lib;Qt5Core.lib;Qt5Sql.lib;Qt5WebEngineWidgets.lib;Qt5WebChannel.lib;Qt5Multimedia.lib;Qt5MultimediaWidgets.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>$(QTDIR)\lib;..\ring-daemon\contrib\msvc\lib\x64;..\daemon\contrib\msvc\lib\x64;..\ring-daemon\MSVC\x64\ReleaseLib_win32\bin;..\daemon\MSVC\x64\ReleaseLib_win32\bin;..\ring-lrc\msvc\release;..\lrc\msvc\release;..\ring-lrc\msvc\src\qtwrapper\Release;..\lrc\msvc\src\qtwrapper\Release;.\winsparkle\x64\release;.\qrencode-win32\qrencode-win32\vc8\qrcodelib\x64\Release-Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>dring.lib;qtwrapper.lib;ringclient_static.lib;qrcodelib.lib;shell32.lib;Ole32.lib;Advapi32.lib;Shlwapi.lib;User32.lib;Gdi32.lib;Crypt32.lib;Strmiids.lib;qtmain.lib;Qt5Svg.lib;Qt5Widgets.lib;Qt5WinExtras.lib;Qt5Gui.lib;Qt5Xml.lib;Qt5Network.lib;Qt5Core.lib;Qt5Sql.lib;Qt5WebEngineWidgets.lib;Qt5WebChannel.lib;Qt5Multimedia.lib;Qt5MultimediaWidgets.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(QTDIR)\lib;..\ring-daemon\contrib\msvc\lib\x64;..\daemon\contrib\msvc\lib\x64;..\ring-daemon\MSVC\x64\ReleaseLib_win32\bin;..\daemon\MSVC\x64\ReleaseLib_win32\bin;..\ring-lrc\msvc\release;..\lrc\msvc\release;..\ring-lrc\msvc\src\qtwrapper\Release;..\lrc\msvc\src\qtwrapper\Release;.\qrencode-win32\qrencode-win32\vc8\qrcodelib\x64\Release-Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" /ignore:4006,4049,4078,4098 /LTCG /NODEFAULTLIB:LIBCMT %(AdditionalOptions)</AdditionalOptions>
<DataExecutionPrevention>true</DataExecutionPrevention>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -127,7 +127,7 @@
<ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription>
<InputFile>%(FullPath)</InputFile>
<DynamicSource>output</DynamicSource>
- <IncludePath>.\GeneratedFiles\$(ConfigurationName);.\GeneratedFiles;.;$(ProjectDir)..\ring-daemon\contrib\msvc\include;$(ProjectDir)..\daemon\contrib\msvc\include;$(ProjectDir)..\ring-lrc\src;$(ProjectDir)..\lrc\src;$(ProjectDir)winsparkle\include;$(ProjectDir)qrencode-win32\qrencode-win32;$(QTDIR)\include;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtWinExtras;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtXml;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtCore;$(QTDIR)\mkspecs\win32-msvc;.\release;%(AdditionalIncludeDirectories)</IncludePath>
+ <IncludePath>.\GeneratedFiles\$(ConfigurationName);.\GeneratedFiles;.;$(ProjectDir)..\ring-daemon\contrib\msvc\include;$(ProjectDir)..\daemon\contrib\msvc\include;$(ProjectDir)..\ring-lrc\src;$(ProjectDir)..\lrc\src;$(ProjectDir)qrencode-win32\qrencode-win32;$(QTDIR)\include;$(QTDIR)\include\QtSvg;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtWinExtras;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtXml;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtWebEngineWidgets;$(QTDIR)\include\QtWebChannel;$(QTDIR)\include\QtCore;$(QTDIR)\mkspecs\win32-msvc;.\release;%(AdditionalIncludeDirectories)</IncludePath>
</QtMoc>
<QtRcc>
<InitFuncName>ressources</InitFuncName>
diff --git a/settingskey.h b/settingskey.h
index f417e1f31594141ee3495cc844ff36a27c23dd74..0167af4cc825dbacf329edb29f0d843d3fc2593f 100644
--- a/settingskey.h
+++ b/settingskey.h
@@ -27,4 +27,5 @@ constexpr static char geometry[] = "geometry";
constexpr static char selectedAccount[] = "selectedAccount";
constexpr static char mainSplitterState[] = "mainSplitterState";
constexpr static char windowState[] = "windowState";
+constexpr static char autoUpdate[] = "autoUpdate";
}
diff --git a/settingswidget.cpp b/settingswidget.cpp
index 5a6cde1eae1394c7346ba591e7323ddf310c7786..b29eb2af23761da58fc9bc0701804925f58c488d 100644
--- a/settingswidget.cpp
+++ b/settingswidget.cpp
@@ -56,10 +56,6 @@
#include "video/rate.h"
#include "video/resolution.h"
-#ifdef Q_OS_WIN
-#include "winsparkle.h"
-#endif
-
SettingsWidget::SettingsWidget(QWidget* parent)
: NavWidget(parent)
, ui(new Ui::SettingsWidget)
@@ -804,8 +800,6 @@ void SettingsWidget::setConnections()
connect(ui->checkUpdateButton, &QAbstractButton::clicked, this, &SettingsWidget::checkForUpdateSlot);
- connect(ui->intervalUpdateCheckSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &SettingsWidget::setUpdateIntervalSlot);
-
connect(ui->autoUpdateCheckBox, &QAbstractButton::clicked, this, &SettingsWidget::slotSetUpdateAutomatic);
// audio / visual settings
@@ -842,8 +836,7 @@ void SettingsWidget::populateGeneralSettings()
Utils::setElidedText(ui->recordPathButton, media::RecordingModel::instance().recordPath());
#ifdef Q_OS_WIN
- ui->autoUpdateCheckBox->setChecked(win_sparkle_get_automatic_check_for_updates());
- ui->intervalUpdateCheckSpinBox->setValue(win_sparkle_get_update_check_interval() / 86400);
+ ui->autoUpdateCheckBox->setChecked(settings.value(SettingsKey::autoUpdate).toBool());
#endif
}
@@ -860,28 +853,18 @@ void SettingsWidget::slotSetClosedOrMin(bool state)
}
void SettingsWidget::checkForUpdateSlot()
-{
- Utils::checkForUpdates(true, this);
- /*
-#ifdef Q_OS_WIN
- win_sparkle_check_update_with_ui();
-#endif
- */
-}
-
-void SettingsWidget::setUpdateIntervalSlot(int value)
{
#ifdef Q_OS_WIN
- win_sparkle_set_update_check_interval(value * 86400);
+ Utils::checkForUpdates(true, this);
#endif
}
void SettingsWidget::slotSetUpdateAutomatic(bool state)
{
#ifdef Q_OS_WIN
- win_sparkle_set_automatic_check_for_updates(state);
+ QSettings settings("jami.net", "Jami");
+ settings.setValue(SettingsKey::autoUpdate, state);
#endif
- ui->intervalUpdateCheckSpinBox->setEnabled(state);
}
void SettingsWidget::openDownloadFolderSlot()
diff --git a/settingswidget.h b/settingswidget.h
index 00bc80664041f786bfe05137c556dcd6dce24ce4..954d8787f30faa4c462adcfa46580b63062c3f00 100644
--- a/settingswidget.h
+++ b/settingswidget.h
@@ -133,7 +133,6 @@ private slots:
void openDownloadFolderSlot();
void slotSetAlwaysRecording(bool state);
void openRecordFolderSlot();
- void setUpdateIntervalSlot(int value);
void slotSetUpdateAutomatic(bool state);
void outputDevIndexChangedSlot(int index);
void inputdevIndexChangedSlot(int index);
diff --git a/settingswidget.ui b/settingswidget.ui
index 9c4fb66bfdd9cba639bba44168d70c09b87dfb92..5bc12eed2a2c422813117070dade03f8ba69fdd1 100644
--- a/settingswidget.ui
+++ b/settingswidget.ui
@@ -376,7 +376,7 @@
</size>
</property>
<property name="currentIndex">
- <number>3</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="generalSettings">
<property name="sizePolicy">
@@ -1012,39 +1012,6 @@
</property>
</widget>
</item>
- <item>
- <widget class="QSpinBox" name="intervalUpdateCheckSpinBox">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="maximumSize">
- <size>
- <width>180</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="toolTip">
- <string>Interval between update checks in days selector</string>
- </property>
- <property name="keyboardTracking">
- <bool>false</bool>
- </property>
- <property name="suffix">
- <string> days</string>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="value">
- <number>3</number>
- </property>
- </widget>
- </item>
</layout>
</item>
<item>
@@ -1280,7 +1247,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>745</width>
+ <width>749</width>
<height>1416</height>
</rect>
</property>
@@ -2603,7 +2570,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>745</width>
+ <width>749</width>
<height>886</height>
</rect>
</property>
diff --git a/winsparkle b/winsparkle
deleted file mode 160000
index 6e7bb8554852d7f964fd176c440dd29cc772f2dc..0000000000000000000000000000000000000000
--- a/winsparkle
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6e7bb8554852d7f964fd176c440dd29cc772f2dc
diff --git a/winsparkle.patch b/winsparkle.patch
deleted file mode 100644
index 47ece561982148c0173215a2feabc2362f0b334a..0000000000000000000000000000000000000000
--- a/winsparkle.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 679dde6574e7c465dff38542f20691d9e836d42f Mon Sep 17 00:00:00 2001
-From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
-Date: Wed, 5 Dec 2018 10:13:17 -0500
-Subject: [PATCH] b
-
----
- 3rdparty/expat-2015.vcxproj | 11 ++++++-----
- 3rdparty/libcrypto-2015.vcxproj | 11 ++++++-----
- 3rdparty/wx-2015.vcxproj | 9 +++++----
- WinSparkle-2015.vcxproj | 8 ++++----
- 4 files changed, 21 insertions(+), 18 deletions(-)
-
-diff --git a/3rdparty/expat-2015.vcxproj b/3rdparty/expat-2015.vcxproj
-index 7be39be..a310e31 100644
---- a/3rdparty/expat-2015.vcxproj
-+++ b/3rdparty/expat-2015.vcxproj
-@@ -25,32 +25,33 @@
- <Keyword>Win32Proj</Keyword>
- <RootNamespace>WinSparkle_expat</RootNamespace>
- <ProjectName>WinSparkle_expat</ProjectName>
-+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -183,4 +184,4 @@
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/3rdparty/libcrypto-2015.vcxproj b/3rdparty/libcrypto-2015.vcxproj
-index 8158cc7..e8cbedd 100644
---- a/3rdparty/libcrypto-2015.vcxproj
-+++ b/3rdparty/libcrypto-2015.vcxproj
-@@ -25,32 +25,33 @@
- <Keyword>Win32Proj</Keyword>
- <RootNamespace>WinSparkle_libcrypto</RootNamespace>
- <ProjectName>WinSparkle_libcrypto</ProjectName>
-+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-@@ -720,4 +721,4 @@
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
--</Project>
-+</Project>
-\ No newline at end of file
-diff --git a/3rdparty/wx-2015.vcxproj b/3rdparty/wx-2015.vcxproj
-index e055722..62ebfb7 100644
---- a/3rdparty/wx-2015.vcxproj
-+++ b/3rdparty/wx-2015.vcxproj
-@@ -25,32 +25,33 @@
- <Keyword>Win32Proj</Keyword>
- <RootNamespace>WinSparkle_wx</RootNamespace>
- <ProjectName>WinSparkle_wx</ProjectName>
-+ <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-diff --git a/WinSparkle-2015.vcxproj b/WinSparkle-2015.vcxproj
-index 5ceec0d..a4a64e3 100644
---- a/WinSparkle-2015.vcxproj
-+++ b/WinSparkle-2015.vcxproj
-@@ -32,26 +32,26 @@
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
-- <PlatformToolset>v140_xp</PlatformToolset>
-+ <PlatformToolset>v141</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
---
-2.19.0.windows.1
-