From 63f1429a69b355bf484c33a4e837cb3d9bc9dc70 Mon Sep 17 00:00:00 2001 From: Alekhya Date: Wed, 6 May 2020 12:49:34 -0700 Subject: [PATCH] Fix incorrect merge which had reverted some parts of the Microsoft.Launcher.rc file (#2728) * Had reverted the changes made in the Microsoft.Launcher.rc file by mistake while resolving merge conflicts * reverted company name to how it was before --- .../Microsoft.Launcher/Microsoft.Launcher.rc | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc index c870c17192..a9f7e45937 100644 --- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc +++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc @@ -1,14 +1,15 @@ ÿþ#include "resource.h" +#include "../../../common/version.h" STRINGTABLE BEGIN - IDS_LAUNCHER_NAME L"Launcher" + IDS_LAUNCHER_NAME L"Run" IDS_LAUNCHER_SETTINGS_DESC L"This feature requires Windows 10, May 2019 Update" END 1 VERSIONINFO - FILEVERSION 0,1,0,0 - PRODUCTVERSION 0,1,0,0 + FILEVERSION FILE_VERSION + PRODUCTVERSION PRODUCT_VERSION FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -23,14 +24,14 @@ BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Company Name" - VALUE "FileDescription", "Wox.Launcher Module" - VALUE "FileVersion", "0.1.0.0" - VALUE "InternalName", "Wox.Launcher" - VALUE "LegalCopyright", "Copyright (C) 2019 Company Name" - VALUE "OriginalFilename", "Wox.Launcher.dll" - VALUE "ProductName", "Wox.Launcher" - VALUE "ProductVersion", "0.1.0.0" + VALUE "CompanyName", COMPANY_NAME + VALUE "FileDescription", "Microsoft.Launcher Module" + VALUE "FileVersion", FILE_VERSION_STRING + VALUE "InternalName", "Microsoft.Launcher" + VALUE "LegalCopyright", COPYRIGHT_NOTE + VALUE "OriginalFilename", "Microsoft.Launcher.dll" + VALUE "ProductName", "Microsoft.Launcher" + VALUE "ProductVersion", PRODUCT_VERSION_STRING END END BLOCK "VarFileInfo"