From f42409cb171e7fdc06352dd5ed6dde3866d8d5b4 Mon Sep 17 00:00:00 2001 From: Jaime Bernardo Date: Thu, 28 Apr 2022 12:20:05 +0100 Subject: [PATCH] [ci]Rename WindowStylesReportTool to StylesReportTool (#17950) --- .pipelines/ESRPSigning_core.json | 2 +- .pipelines/ci/templates/build-powertoys-steps.yml | 10 +++++----- .pipelines/release.yml | 4 ++-- doc/devdocs/readme.md | 4 ++-- installer/PowerToysSetup/Product.wxs | 6 +++--- .../Resource.h | 2 +- .../StylesReportTool.cpp} | 8 ++++---- .../StylesReportTool.h} | 0 .../StylesReportTool.ico} | Bin .../StylesReportTool.rc} | 2 +- .../StylesReportTool.sln} | 2 +- .../StylesReportTool.vcxproj} | 10 +++++----- .../StylesReportTool.vcxproj.filters} | 8 ++++---- .../pch.cpp | 0 .../pch.h | 0 .../small.ico | Bin 16 files changed, 29 insertions(+), 29 deletions(-) rename tools/{WindowStylesReportTool => StylesReportTool}/Resource.h (93%) rename tools/{WindowStylesReportTool/WindowStylesReportTool.cpp => StylesReportTool/StylesReportTool.cpp} (98%) rename tools/{WindowStylesReportTool/WindowStylesReportTool.h => StylesReportTool/StylesReportTool.h} (100%) rename tools/{WindowStylesReportTool/WindowStylesReportTool.ico => StylesReportTool/StylesReportTool.ico} (100%) rename tools/{WindowStylesReportTool/WindowStylesReportTool.rc => StylesReportTool/StylesReportTool.rc} (98%) rename tools/{WindowStylesReportTool/WindowStylesReportTool.sln => StylesReportTool/StylesReportTool.sln} (89%) rename tools/{WindowStylesReportTool/WindowStylesReportTool.vcxproj => StylesReportTool/StylesReportTool.vcxproj} (94%) rename tools/{WindowStylesReportTool/WindowStylesReportTool.vcxproj.filters => StylesReportTool/StylesReportTool.vcxproj.filters} (87%) rename tools/{WindowStylesReportTool => StylesReportTool}/pch.cpp (100%) rename tools/{WindowStylesReportTool => StylesReportTool}/pch.h (100%) rename tools/{WindowStylesReportTool => StylesReportTool}/small.ico (100%) diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json index e8c370c09e..ec613f1b8f 100644 --- a/.pipelines/ESRPSigning_core.json +++ b/.pipelines/ESRPSigning_core.json @@ -17,7 +17,7 @@ "PowerToys.Interop.dll", "BugReportTool\\PowerToys.BugReportTool.exe", "WebcamReportTool\\PowerToys.WebcamReportTool.exe", - "WindowStylesReportTool\\PowerToys.WindowStylesReportTool.exe", + "StylesReportTool\\PowerToys.StylesReportTool.exe", "Telemetry.dll", "PowerToys.ManagedTelemetry.dll", "PowerToys.ManagedCommon.dll", diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml index b54c7a9fd8..65e95bc587 100644 --- a/.pipelines/ci/templates/build-powertoys-steps.yml +++ b/.pipelines/ci/templates/build-powertoys-steps.yml @@ -77,18 +77,18 @@ steps: maximumCpuCount: true - task: NuGetCommand@2 - displayName: Restore NuGet packages for WindowStylesReportTool.sln + displayName: Restore NuGet packages for StylesReportTool.sln inputs: command: restore feedsToUse: config configPath: NuGet.config - restoreSolution: tools\WindowStylesReportTool\WindowStylesReportTool.sln - restoreDirectory: '$(Build.SourcesDirectory)\tools\WindowStylesReportTool\packages' + restoreSolution: tools\StylesReportTool\StylesReportTool.sln + restoreDirectory: '$(Build.SourcesDirectory)\tools\StylesReportTool\packages' - task: VSBuild@1 - displayName: 'Build WindowStylesReportTool.sln' + displayName: 'Build StylesReportTool.sln' inputs: - solution: '**\WindowStylesReportTool.sln' + solution: '**\StylesReportTool.sln' vsVersion: 17.0 platform: '$(BuildPlatform)' configuration: '$(BuildConfiguration)' diff --git a/.pipelines/release.yml b/.pipelines/release.yml index 5e7d2d5bc5..3f44870bac 100644 --- a/.pipelines/release.yml +++ b/.pipelines/release.yml @@ -156,9 +156,9 @@ jobs: maximumCpuCount: true - task: VSBuild@1 - displayName: Build WindowStylesReportTool + displayName: Build StylesReportTool inputs: - solution: '**/tools/WindowStylesReportTool/WindowStylesReportTool.sln' + solution: '**/tools/StylesReportTool/StylesReportTool.sln' vsVersion: 17.0 msbuildArgs: /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog platform: $(BuildPlatform) diff --git a/doc/devdocs/readme.md b/doc/devdocs/readme.md index c2f6459049..c3c2ff4dad 100644 --- a/doc/devdocs/readme.md +++ b/doc/devdocs/readme.md @@ -66,7 +66,7 @@ The installer can only be compiled in `Release` mode, step 1 and 2 must be done 1. Compile `PowerToys.sln`. Instructions are listed above. 2. Compile `BugReportTool.sln` tool. Path from root: `tools\BugReportTool\BugReportTool.sln` (details listed below) 3. Compile `WebcamReportTool.sln` tool. Path from root: `tools\WebcamReportTool\WebcamReportTool.sln` (details listed below) -3. Compile `WindowStylesReportTool.sln` tool. Path from root: `tools\WindowStylesReportTool\WindowStylesReportTool.sln` (details listed below) +3. Compile `StylesReportTool.sln` tool. Path from root: `tools\StylesReportTool\StylesReportTool.sln` (details listed below) 4. Compile `PowerToysSetup.sln` Path from root: `installer\PowerToysSetup.sln` (details listed below) ### Prerequisites for building the MSI installer @@ -88,7 +88,7 @@ The installer can only be compiled in `Release` mode, step 1 and 2 must be done ### Locally compiling the Window styles reporting tool -1. Open `tools\WindowStylesReportTool\WindowStylesReportTool.sln` +1. Open `tools\StylesReportTool\StylesReportTool.sln` 2. In Visual Studio, in the `Solutions Configuration` drop-down menu select `Release` 3. From the `Build` menu, choose `Build Solution`. diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index f52eb502fc..5037e10b65 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -616,8 +616,8 @@ - - + + @@ -1052,7 +1052,7 @@ - + diff --git a/tools/WindowStylesReportTool/Resource.h b/tools/StylesReportTool/Resource.h similarity index 93% rename from tools/WindowStylesReportTool/Resource.h rename to tools/StylesReportTool/Resource.h index 3753dba0ce..6f73f04319 100644 --- a/tools/WindowStylesReportTool/Resource.h +++ b/tools/StylesReportTool/Resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by WindowStylesReportTool.rc +// Used by StylesReportTool.rc #define IDR_MAINFRAME 128 #define IDD_ABOUTBOX 103 diff --git a/tools/WindowStylesReportTool/WindowStylesReportTool.cpp b/tools/StylesReportTool/StylesReportTool.cpp similarity index 98% rename from tools/WindowStylesReportTool/WindowStylesReportTool.cpp rename to tools/StylesReportTool/StylesReportTool.cpp index 3391567cbb..0047b289b6 100644 --- a/tools/WindowStylesReportTool/WindowStylesReportTool.cpp +++ b/tools/StylesReportTool/StylesReportTool.cpp @@ -1,5 +1,5 @@ #include "pch.h" -#include "WindowStylesReportTool.h" +#include "StylesReportTool.h" #include #include @@ -344,7 +344,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, UNREFERENCED_PARAMETER(hPrevInstance); UNREFERENCED_PARAMETER(lpCmdLine); - Logger::init("WindowStylesReportTool"); + Logger::init("StylesReportTool"); WNDCLASSEXW wcex; wcex.cbSize = sizeof(WNDCLASSEX); @@ -357,7 +357,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, wcex.hCursor = LoadCursor(nullptr, IDC_ARROW); wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wcex.lpszMenuName = L""; - wcex.lpszClassName = L"WindowStylesReportTool"; + wcex.lpszClassName = L"StylesReportTool"; wcex.hIconSm = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALLICON)); if (!RegisterClassExW(&wcex)) @@ -366,7 +366,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, return FALSE; } - HWND hWnd = CreateWindowW(L"WindowStylesReportTool", L"Window Style Report Tool", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 600, 200, nullptr, nullptr, hInstance, nullptr); + HWND hWnd = CreateWindowW(L"StylesReportTool", L"Window Style Report Tool", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 600, 200, nullptr, nullptr, hInstance, nullptr); if (!hWnd) { Logger::log(L"Window creation error: {}", get_last_error_or_default(GetLastError())); diff --git a/tools/WindowStylesReportTool/WindowStylesReportTool.h b/tools/StylesReportTool/StylesReportTool.h similarity index 100% rename from tools/WindowStylesReportTool/WindowStylesReportTool.h rename to tools/StylesReportTool/StylesReportTool.h diff --git a/tools/WindowStylesReportTool/WindowStylesReportTool.ico b/tools/StylesReportTool/StylesReportTool.ico similarity index 100% rename from tools/WindowStylesReportTool/WindowStylesReportTool.ico rename to tools/StylesReportTool/StylesReportTool.ico diff --git a/tools/WindowStylesReportTool/WindowStylesReportTool.rc b/tools/StylesReportTool/StylesReportTool.rc similarity index 98% rename from tools/WindowStylesReportTool/WindowStylesReportTool.rc rename to tools/StylesReportTool/StylesReportTool.rc index 83e42764bd..0f30913062 100644 --- a/tools/WindowStylesReportTool/WindowStylesReportTool.rc +++ b/tools/StylesReportTool/StylesReportTool.rc @@ -26,7 +26,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_WINDOWSTYLESICON ICON "WindowStylesReportTool.ico" +IDI_WINDOWSTYLESICON ICON "StylesReportTool.ico" IDI_SMALL ICON "small.ico" diff --git a/tools/WindowStylesReportTool/WindowStylesReportTool.sln b/tools/StylesReportTool/StylesReportTool.sln similarity index 89% rename from tools/WindowStylesReportTool/WindowStylesReportTool.sln rename to tools/StylesReportTool/StylesReportTool.sln index f16f6fe905..039ba33433 100644 --- a/tools/WindowStylesReportTool/WindowStylesReportTool.sln +++ b/tools/StylesReportTool/StylesReportTool.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowStylesReportTool", "WindowStylesReportTool.vcxproj", "{0FEBAFAF-CB77-41F0-8EF9-8E3AD4B4F842}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StylesReportTool", "StylesReportTool.vcxproj", "{0FEBAFAF-CB77-41F0-8EF9-8E3AD4B4F842}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/tools/WindowStylesReportTool/WindowStylesReportTool.vcxproj b/tools/StylesReportTool/StylesReportTool.vcxproj similarity index 94% rename from tools/WindowStylesReportTool/WindowStylesReportTool.vcxproj rename to tools/StylesReportTool/StylesReportTool.vcxproj index 6fb57d152e..3c9b90dd70 100644 --- a/tools/WindowStylesReportTool/WindowStylesReportTool.vcxproj +++ b/tools/StylesReportTool/StylesReportTool.vcxproj @@ -14,7 +14,7 @@ 16.0 Win32Proj {0febafaf-cb77-41f0-8ef9-8e3ad4b4f842} - WindowStylesReportTool + StylesReportTool 10.0.18362.0 @@ -87,22 +87,22 @@ - + - + Create Create - + - + diff --git a/tools/WindowStylesReportTool/WindowStylesReportTool.vcxproj.filters b/tools/StylesReportTool/StylesReportTool.vcxproj.filters similarity index 87% rename from tools/WindowStylesReportTool/WindowStylesReportTool.vcxproj.filters rename to tools/StylesReportTool/StylesReportTool.vcxproj.filters index 2aff154c7a..efb0748518 100644 --- a/tools/WindowStylesReportTool/WindowStylesReportTool.vcxproj.filters +++ b/tools/StylesReportTool/StylesReportTool.vcxproj.filters @@ -18,7 +18,7 @@ Header Files - + Header Files @@ -26,7 +26,7 @@ - + Source Files @@ -34,7 +34,7 @@ - + Resource Files @@ -42,7 +42,7 @@ Resource Files - + Resource Files diff --git a/tools/WindowStylesReportTool/pch.cpp b/tools/StylesReportTool/pch.cpp similarity index 100% rename from tools/WindowStylesReportTool/pch.cpp rename to tools/StylesReportTool/pch.cpp diff --git a/tools/WindowStylesReportTool/pch.h b/tools/StylesReportTool/pch.h similarity index 100% rename from tools/WindowStylesReportTool/pch.h rename to tools/StylesReportTool/pch.h diff --git a/tools/WindowStylesReportTool/small.ico b/tools/StylesReportTool/small.ico similarity index 100% rename from tools/WindowStylesReportTool/small.ico rename to tools/StylesReportTool/small.ico