Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-15 19:27:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Unify dll/exe naming] Tools (#15254)

Browse Source
This commit is contained in:
Stefan Markovic
2022-01-12 13:00:23 +01:00
committed by GitHub
parent aa876838d4
commit 127cf4e412
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.pipelines/ESRPSigning_core.json
View File

@@ -15,8 +15,8 @@
"os-detection.dll", "os-detection.dll",
"PowerToys.exe", "PowerToys.exe",
"PowerToys.Interop.dll", "PowerToys.Interop.dll",
"BugReportTool\\BugReportTool.exe", "BugReportTool\\PowerToys.BugReportTool.exe",
"WebcamReportTool\\WebcamReportTool.exe", "WebcamReportTool\\PowerToys.WebcamReportTool.exe",
"Telemetry.dll", "Telemetry.dll",
"PowerToys.ManagedTelemetry.dll", "PowerToys.ManagedTelemetry.dll",
"PowerToys.ManagedCommon.dll", "PowerToys.ManagedCommon.dll",

4
installer/PowerToysSetup/Product.wxs
View File

@@ -546,10 +546,10 @@
<DirectoryRef Id="ToolsFolder"> <DirectoryRef Id="ToolsFolder">
<Component Id="BugReportTool_exe" Guid="0F8E3E9F-2E86-4660-A3BF-AE4DD431B93C" Win64="yes"> <Component Id="BugReportTool_exe" Guid="0F8E3E9F-2E86-4660-A3BF-AE4DD431B93C" Win64="yes">
<File Source="$(var.BinX64Dir)BugReportTool\BugReportTool.exe" Id="BugReportTool.exe" KeyPath="yes" Checksum="yes" /> <File Source="$(var.BinX64Dir)BugReportTool\PowerToys.BugReportTool.exe" Id="BugReportTool.exe" KeyPath="yes" Checksum="yes" />
</Component> </Component>
<Component Id="WebcamReportTool_exe" Guid="B6005DAC-8C26-4865-91B3-99F098422C13" Win64="yes"> <Component Id="WebcamReportTool_exe" Guid="B6005DAC-8C26-4865-91B3-99F098422C13" Win64="yes">
<File Source="$(var.BinX64Dir)WebcamReportTool\WebcamReportTool.exe" Id="WebcamReportTool.exe" Checksum="yes" /> <File Source="$(var.BinX64Dir)WebcamReportTool\PowerToys.WebcamReportTool.exe" Id="WebcamReportTool.exe" Checksum="yes" />
</Component> </Component>
</DirectoryRef> </DirectoryRef>

2
src/runner/tray_icon.cpp
View File

@@ -91,7 +91,7 @@ void handle_tray_command(HWND window, const WPARAM command_id, LPARAM lparam)
case ID_REPORT_BUG_COMMAND: case ID_REPORT_BUG_COMMAND:
{ {
std::wstring bug_report_path = get_module_folderpath(); std::wstring bug_report_path = get_module_folderpath();
bug_report_path += L"\\Tools\\BugReportTool.exe"; bug_report_path += L"\\Tools\\PowerToys.BugReportTool.exe";
SHELLEXECUTEINFOW sei{ sizeof(sei) }; SHELLEXECUTEINFOW sei{ sizeof(sei) };
sei.fMask = { SEE_MASK_FLAG_NO_UI | SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE }; sei.fMask = { SEE_MASK_FLAG_NO_UI | SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE };
sei.lpFile = bug_report_path.c_str(); sei.lpFile = bug_report_path.c_str();

6
tools/BugReportTool/BugReportTool/BugReportTool.vcxproj
View File

@@ -14,6 +14,12 @@
<IntDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\obj\$(ProjectName)\</IntDir> <IntDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\obj\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir> <OutDir>$(SolutionDir)..\..\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>PowerToys.$(ProjectName)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<TargetName>PowerToys.$(ProjectName)</TargetName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>

4
tools/WebcamReportTool/WebcamReportTool.vcxproj
View File

@@ -24,14 +24,14 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<TargetName>WebcamReportTool</TargetName> <TargetName>PowerToys.WebcamReportTool</TargetName>
<TargetExt>.exe</TargetExt> <TargetExt>.exe</TargetExt>
<IncludePath>include;$(IncludePath)</IncludePath> <IncludePath>include;$(IncludePath)</IncludePath>
<LibraryPath>lib;$(LibraryPath)</LibraryPath> <LibraryPath>lib;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<TargetName>WebcamReportTool</TargetName> <TargetName>PowerToys.WebcamReportTool</TargetName>
<TargetExt>.exe</TargetExt> <TargetExt>.exe</TargetExt>
<IncludePath>include;$(IncludePath)</IncludePath> <IncludePath>include;$(IncludePath)</IncludePath>
<LibraryPath>lib;$(LibraryPath)</LibraryPath> <LibraryPath>lib;$(LibraryPath)</LibraryPath>