Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-03 17:56:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

[Settings] Update version in General Settings (#2601)

Browse Source 
* Update version in General Settings

* Set version in settings.json file

* Only overwrite the settings.json file if it is newer than the old version.

* Fix tests

* Fix test names and added comment
This commit is contained in:
Tomas Agustin Raies
2020-05-04 14:40:32 -07:00
committed by GitHub
parent d401474981
commit 7fc140af01
13 changed files with 174 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/interop/interop.h
View File

@@ -1,10 +1,11 @@
#pragma once
#include "..\keyboard_layout.h"
#include "..\two_way_pipe_message_ipc.h"
#include <msclr\marshal.h>
#include <msclr\marshal_cppstd.h>
#include <functional>
#include "..\keyboard_layout.h"
#include "..\two_way_pipe_message_ipc.h"
#include "..\common.h"
using namespace System;
using namespace System::Runtime::InteropServices;
@@ -103,4 +104,14 @@ public
_callback(gcnew String(msg.c_str()));
}
};
public
ref class CommonManaged
{
public:
static String^ GetProductVersion()
{
return gcnew String(get_product_version().c_str());
}
};
}

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

@@ -73,7 +73,7 @@
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>
</DelayLoadDLLs>
</Link>
@@ -89,7 +89,7 @@
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>
</DelayLoadDLLs>
</Link>