Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-09 20:57:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Now updater is comparing versions instead of comparing thier strings

Browse Source
This commit is contained in:
PrzemyslawTusinski
2020-02-25 09:44:13 +01:00
committed by Andrey Nekrasov
parent 0016836022
commit f015995ac4
10 changed files with 210 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/msi_to_msix_upgrade_lib/msi_to_msix_upgrade.cpp
View File

@@ -1,4 +1,7 @@
#include "pch.h"
#include "version.h"
#include "msi_to_msix_upgrade.h"
#include <msi.h>
@@ -12,6 +15,8 @@
#include <winrt/Windows.Web.Http.h>
#include <winrt/Windows.Web.Http.Headers.h>
#include "VersionHelper.h"
namespace
{
const wchar_t* POWER_TOYS_UPGRADE_CODE = L"{42B84BF7-5FBF-473B-9C8B-049DC16F7708}";
@@ -104,13 +109,18 @@ std::future<std::optional<new_version_download_info>> check_for_new_github_relea
auto new_version = json_body.GetNamedString(L"tag_name");
winrt::Windows::Foundation::Uri release_page_uri{ json_body.GetNamedString(L"html_url") };
const auto current_version = get_product_version();
if (new_version == current_version)
VersionHelper github_version(winrt::to_string(new_version));
VersionHelper current_version(VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION);
if (current_version > github_version)
{
co_return std::nullopt;
}
co_return new_version_download_info{ std::move(release_page_uri), new_version.c_str() };
else
{
co_return new_version_download_info{ std::move(release_page_uri), new_version.c_str() };
}
}
catch (...)
{

4
src/common/msi_to_msix_upgrade_lib/msi_to_msix_upgrade_lib.vcxproj
View File

@@ -98,6 +98,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -118,6 +119,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -136,6 +138,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -156,6 +159,7 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>