Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unify dll/exe naming - BackgroundActivatorDLL (#14797)

Browse Source
This commit is contained in:
Stefan Markovic
2021-12-06 13:02:09 +01:00
committed by GitHub
parent fc303c2c38
commit d8f2946ba6
5 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pipelines/pipeline.user.windows.yml
View File

@@ -73,7 +73,7 @@ build:
include: include:
- 'PowerToys.ActionRunner.exe' - 'PowerToys.ActionRunner.exe'
- 'PowerToys.Update.exe' - 'PowerToys.Update.exe'
- 'BackgroundActivatorDLL.dll' - 'PowerToys.BackgroundActivatorDLL.dll'
- 'Notifications.dll' - 'Notifications.dll'
- 'os-detection.dll' - 'os-detection.dll'
- 'PowerToys.exe' - 'PowerToys.exe'

2
installer/PowerToysSetup/Product.wxs
View File

@@ -417,7 +417,7 @@
</RegistryKey> </RegistryKey>
</Component> </Component>
<Component Id="BackgroundActivator_dll" Guid="23B25EE4-BCA2-45DF-BBCD-82FBDF01C5AB" Win64="yes"> <Component Id="BackgroundActivator_dll" Guid="23B25EE4-BCA2-45DF-BBCD-82FBDF01C5AB" Win64="yes">
<File Id="BackgroundActivatorDLL.dll" KeyPath="yes" Checksum="yes" /> <File Id="PowerToys.BackgroundActivatorDLL.dll" KeyPath="yes" Checksum="yes" />
</Component> </Component>
<Component Id="PowerToys_ActionRunner_exe" Guid="626ABB17-16F0-4007-9A58-6998724A5E14" Win64="yes"> <Component Id="PowerToys_ActionRunner_exe" Guid="626ABB17-16F0-4007-9A58-6998724A5E14" Win64="yes">
<File Id="PowerToys.ActionRunner.exe" KeyPath="yes" Checksum="yes" /> <File Id="PowerToys.ActionRunner.exe" KeyPath="yes" Checksum="yes" />

6
src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" /> <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion> <VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{031AC72E-FA28-4AB7-B690-6F7B9C28AA73}</ProjectGuid> <ProjectGuid>{031AC72E-FA28-4AB7-B690-6F7B9C28AA73}</ProjectGuid>
@@ -12,7 +11,6 @@
<PropertyGroup Label="Configuration"> <PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>
@@ -32,9 +30,8 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<TargetName>BackgroundActivatorDLL</TargetName> <TargetName>PowerToys.BackgroundActivatorDLL</TargetName>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'"> <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
<ClCompile> <ClCompile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -45,7 +42,6 @@
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<WarningLevel>Level4</WarningLevel> <WarningLevel>Level4</WarningLevel>

2
src/common/notifications/BackgroundActivatorDLL/resource.h
View File

@@ -7,7 +7,7 @@
#define FILE_DESCRIPTION "PowerToys Notifications" #define FILE_DESCRIPTION "PowerToys Notifications"
#define INTERNAL_NAME "Notifications" #define INTERNAL_NAME "Notifications"
#define ORIGINAL_FILENAME "BackgroundActivatorDLL.dll" #define ORIGINAL_FILENAME "PowerToys.BackgroundActivatorDLL.dll"
// Non-localizable // Non-localizable
////////////////////////////// //////////////////////////////

2
src/common/notifications/notifications.cpp
View File

@@ -95,7 +95,7 @@ public:
const NOTIFICATION_USER_INPUT_DATA*, const NOTIFICATION_USER_INPUT_DATA*,
ULONG) override ULONG) override
{ {
auto lib = LoadLibraryW(L"BackgroundActivatorDLL.dll"); auto lib = LoadLibraryW(L"PowerToys.BackgroundActivatorDLL.dll");
if (!lib) if (!lib)
{ {
return 1; return 1;