Added info to projects inside root, tests and common folders (#4413)

2025-12-16 11:48:06 +01:00 · 2020-06-23 16:53:16 +03:00
parent bb22155482
commit ad440f70fa
26 changed files with 255 additions and 56 deletions
--- a/src/action_runner/action_runner.rc
+++ b/src/action_runner/action_runner.rc
@@ -1,5 +1,4 @@
-// Microsoft Visual C++ generated resource script.
-//
+#include <windows.h>
 #include "resource.h"
 #include "../common/version.h"

@@ -12,32 +11,32 @@ END
 1 VERSIONINFO
 FILEVERSION FILE_VERSION
 PRODUCTVERSION PRODUCT_VERSION
- FILEFLAGSMASK 0x3fL
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
- FILEFLAGS 0x1L
+FILEFLAGS VS_FF_DEBUG
 #else
 FILEFLAGS 0x0L
 #endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN 
 BEGIN
    BLOCK "StringFileInfo"
    BEGIN
-        BLOCK "040904b0"
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
        BEGIN
            VALUE "CompanyName", COMPANY_NAME
-            VALUE "FileDescription", "PowerToys Action Runner"
+            VALUE "FileDescription", FILE_DESCRIPTION
            VALUE "FileVersion", FILE_VERSION_STRING
-            VALUE "InternalName", "PowerToys Action Runner"
+            VALUE "InternalName", INTERNAL_NAME
            VALUE "LegalCopyright", COPYRIGHT_NOTE
-            VALUE "OriginalFilename", "action_runner.exe"
-            VALUE "ProductName", "PowerToys"
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
            VALUE "ProductVersion", PRODUCT_VERSION_STRING
        END
    END
    BLOCK "VarFileInfo"
    BEGIN
-        VALUE "Translation", 0x409, 1200
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
    END
 END
--- a/src/action_runner/resource.h
+++ b/src/action_runner/resource.h
@@ -1,3 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by action_runner.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys ActionRunner"
+#define INTERNAL_NAME "action_runner"
+#define ORIGINAL_FILENAME "action_runner.exe"
+
+// Non-localizable
+//////////////////////////////
+
 #define IDS_DOTNET_CORE_DOWNLOAD_FAILURE 101
 #define IDS_DOTNET_CORE_DOWNLOAD_FAILURE_TITLE 102
-
--- a/src/common/ManagedTelemetry/Telemetry/Telemetry.csproj
+++ b/src/common/ManagedTelemetry/Telemetry/Telemetry.csproj
@@ -6,6 +6,14 @@
    <PlatformTarget>x64</PlatformTarget>
    <TargetFramework>netstandard2.0</TargetFramework>
    <Version>$(Version).0</Version>
+    <Authors>Microsoft Corporation</Authors>
+    <Product>PowerToys</Product>
+    <Description>PowerToys Telemetry</Description>
+    <Copyright>Copyright (C) 2020 Microsoft Corporation</Copyright>
+    <RepositoryUrl>https://github.com/microsoft/PowerToys</RepositoryUrl>
+    <RepositoryType>Github</RepositoryType>
+    <PackageTags>PowerToys</PackageTags>
+    <NeutralLanguage>en-US</NeutralLanguage>
  </PropertyGroup>

  <ItemGroup>
--- a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.rc
+++ b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.rc
@@ -0,0 +1,36 @@
+#include <windows.h>
+#include "resource.h"
+#include "../version.h"
+
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN 
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END
--- a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj
+++ b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj
@@ -111,6 +111,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\common.vcxproj">
@@ -120,6 +121,9 @@
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="UnitTests-CommonLib.rc" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
    <Import Project="..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200514.2\build\native\Microsoft.Windows.CppWinRT.targets')" />
--- a/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj.filters
+++ b/src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj.filters
@@ -32,8 +32,16 @@
    <ClInclude Include="pch.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="UnitTests-CommonLib.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
--- a/src/common/UnitTests-CommonLib/resource.h
+++ b/src/common/UnitTests-CommonLib/resource.h
@@ -0,0 +1,13 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by UnitTests-CommonLib.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys UnitTests-CommonLib"
+#define INTERNAL_NAME "UnitTests-CommonLib"
+#define ORIGINAL_FILENAME "UnitTests-CommonLib.dll"
+
+// Non-localizable
+//////////////////////////////
--- a/src/common/interop/Resource.h
+++ b/src/common/interop/Resource.h
@@ -1,3 +1,13 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by app.rc
+// Used by interop.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys Interop"
+#define INTERNAL_NAME "PowerToysInterop"
+#define ORIGINAL_FILENAME "PowerToysInterop.dll"
+
+// Non-localizable
+//////////////////////////////
--- a/src/common/interop/app.ico
+++ b/src/common/interop/app.ico
--- a/src/common/interop/app.rc
+++ b/src/common/interop/app.rc
--- a/src/common/interop/interop.rc
+++ b/src/common/interop/interop.rc
--- a/src/common/interop/interop.vcxproj
+++ b/src/common/interop/interop.vcxproj
@@ -128,7 +128,7 @@
    <ClInclude Include="interop.h" />
    <ClInclude Include="KeyboardHook.h" />
    <ClInclude Include="pch.h" />
-    <ClInclude Include="Resource.h" />
+    <ClInclude Include="resource.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="Generated Files\AssemblyInfo.cpp" />
@@ -140,10 +140,7 @@
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
-    <ResourceCompile Include="app.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="app.ico" />
+    <ResourceCompile Include="interop.rc" />
  </ItemGroup>
  <ItemGroup>
    <Reference Include="System" />
--- a/src/common/interop/interop.vcxproj.filters
+++ b/src/common/interop/interop.vcxproj.filters
@@ -18,9 +18,6 @@
    <ClInclude Include="interop.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="Resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="pch.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -30,6 +27,9 @@
    <ClInclude Include="HotkeyManager.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="interop.cpp">
@@ -49,13 +49,8 @@
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
-    <ResourceCompile Include="app.rc">
+    <ResourceCompile Include="interop.rc">
      <Filter>Resource Files</Filter>
    </ResourceCompile>
  </ItemGroup>
-  <ItemGroup>
-    <Image Include="app.ico">
-      <Filter>Resource Files</Filter>
-    </Image>
-  </ItemGroup>
 </Project>
--- a/src/common/notifications/notifications_dll.rc
+++ b/src/common/notifications/notifications_dll.rc
@@ -1,5 +1,6 @@
+#include <windows.h>
 #include "resource.h"
-#include "../../../common/version.h"
+#include "../version.h"

 1 VERSIONINFO
 FILEVERSION FILE_VERSION
@@ -16,20 +17,20 @@
 BEGIN
    BLOCK "StringFileInfo"
    BEGIN
-        BLOCK "040904b0" // English (0x0409), Unicode (0x04B0) charset
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
        BEGIN
            VALUE "CompanyName", COMPANY_NAME
-            VALUE "FileDescription", "PowerToys Notifications"
+            VALUE "FileDescription", FILE_DESCRIPTION
            VALUE "FileVersion", FILE_VERSION_STRING
-            VALUE "InternalName", "PowerToys Notifications"
+            VALUE "InternalName", INTERNAL_NAME
            VALUE "LegalCopyright", COPYRIGHT_NOTE
-            VALUE "OriginalFilename", "powertoys_notifications.dll"
-            VALUE "ProductName", "PowerToys Notifications"
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
            VALUE "ProductVersion", PRODUCT_VERSION_STRING
        END
    END
    BLOCK "VarFileInfo"
    BEGIN
-        VALUE "Translation", 0x409, 1200
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
    END
 END
--- a/src/common/notifications/resource.h
+++ b/src/common/notifications/resource.h
@@ -1 +1,13 @@
-#include <windows.h>
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by notifications_dll.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys Notifications"
+#define INTERNAL_NAME "Notifications"
+#define ORIGINAL_FILENAME "Notifications.dll"
+
+// Non-localizable
+//////////////////////////////
--- a/src/common/os-detection/os-detection.rc
+++ b/src/common/os-detection/os-detection.rc
@@ -0,0 +1,36 @@
+#include <windows.h>
+#include "resource.h"
+#include "../version.h"
+
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN 
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END
--- a/src/common/os-detection/os-detection.vcxproj
+++ b/src/common/os-detection/os-detection.vcxproj
@@ -91,6 +91,7 @@
    <ClInclude Include="framework.h" />
    <ClInclude Include="os-detect.h" />
    <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="dllmain.cpp" />
@@ -99,6 +100,9 @@
      <PrecompiledHeader Condition="'$(CIBuild)'!='true'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="os-detection.rc" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/src/common/os-detection/os-detection.vcxproj.filters
+++ b/src/common/os-detection/os-detection.vcxproj.filters
@@ -24,6 +24,9 @@
    <ClInclude Include="os-detect.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="dllmain.cpp">
@@ -36,4 +39,9 @@
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="os-detection.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
--- a/src/common/os-detection/resource.h
+++ b/src/common/os-detection/resource.h
@@ -0,0 +1,13 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by os-detection.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys OS Detection"
+#define INTERNAL_NAME "os-detection"
+#define ORIGINAL_FILENAME "os-detection.dll"
+
+// Non-localizable
+//////////////////////////////
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -11,9 +11,10 @@
    "." STRINGIZE(VERSION_MINOR) "." STRINGIZE(VERSION_REVISION) ".0"
 #define PRODUCT_VERSION FILE_VERSION
 #define PRODUCT_VERSION_STRING FILE_VERSION_STRING
-#define COMPANY_NAME "Microsoft Corporation"

-#define COPYRIGHT_NOTE "Copyright (C) 2019 Microsoft Corporation"
+#define COMPANY_NAME "Microsoft Corporation"
+#define COPYRIGHT_NOTE "Copyright (C) 2020 Microsoft Corporation"
+#define PRODUCT_NAME "PowerToys"

 enum class version_architecture
 {
--- a/src/runner/resource.h
+++ b/src/runner/resource.h
@@ -1,3 +1,17 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by runner.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys Runner"
+#define INTERNAL_NAME "PowerToys"
+#define ORIGINAL_FILENAME "PowerToys.exe"
+
+// Non-localizable
+//////////////////////////////
+
 #define APPICON 101
 #define ID_TRAY_MENU 102

--- a/src/runner/runner.rc
+++ b/src/runner/runner.rc
--- a/src/runner/runner.vcxproj.filters
+++ b/src/runner/runner.vcxproj.filters
@@ -54,7 +54,6 @@
    <ClInclude Include="unhandled_exception_handler.h">
      <Filter>Utils</Filter>
    </ClInclude>
-    <ClInclude Include="resource.h" />
    <ClInclude Include="lowlevel_keyboard_event.h">
      <Filter>Events</Filter>
    </ClInclude>
@@ -97,6 +96,9 @@
    <ClInclude Include="action_runner_utils.h">
      <Filter>Utils</Filter>
    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <Filter Include="Utils">
@@ -108,9 +110,12 @@
    <Filter Include="Events">
      <UniqueIdentifier>{d409b25e-c0f1-4913-bb32-da4a21339c76}</UniqueIdentifier>
    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="runner.rc" />
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{74d0b535-16ee-46cc-9adf-dc4668bbcfda}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{18a4e642-9246-4494-b916-8505aed19914}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <CopyFileToFolders Include="svgs\icon.ico" />
@@ -160,4 +165,9 @@
  <ItemGroup>
    <Manifest Include="PowerToys.exe.manifest" />
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="runner.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
--- a/src/settings/resource.h
+++ b/src/settings/resource.h
@@ -1 +1,15 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by settings.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys Settings"
+#define INTERNAL_NAME "PowerToysSettings"
+#define ORIGINAL_FILENAME "PowerToysSettings.exe"
+
+// Non-localizable
+//////////////////////////////
+
 #define APPICON 101
--- a/src/settings/settings.rc
+++ b/src/settings/settings.rc
--- a/src/tests/win-app-driver/win-app-driver.csproj
+++ b/src/tests/win-app-driver/win-app-driver.csproj
@@ -6,8 +6,10 @@
  <!-- We don't have GenerateAssemblyInfo task until we use .net core, so we generate it with WriteLinesToFile -->
  <PropertyGroup>
    <AssemblyTitle>win-app-driver</AssemblyTitle>
+    <AssemblyDescription>PowerToys WinAppDriver</AssemblyDescription>
    <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
    <AssemblyCopyright>Copyright (C) 2020 Microsoft Corp.</AssemblyCopyright>
+    <AssemblyProduct>PowerToys</AssemblyProduct>
  </PropertyGroup>
  <ItemGroup>
    <AssemblyVersionFiles Include="Generated Files\AssemblyInfo.cs" />
@@ -23,14 +25,15 @@
      <HeaderLines Include="using System.Runtime.InteropServices%3b" />
      <HeaderLines Include="using System.Windows%3b" />
      <HeaderLines Include="[assembly: AssemblyTitle(&quot;$(AssemblyTitle)&quot;)]" />
-      <HeaderLines Include="[assembly: AssemblyDescription(&quot;&quot;)]" />
+      <HeaderLines Include="[assembly: AssemblyDescription(&quot;$(AssemblyDescription)&quot;)]" />
      <HeaderLines Include="[assembly: AssemblyConfiguration(&quot;&quot;)]" />
      <HeaderLines Include="[assembly: AssemblyCompany(&quot;$(AssemblyCompany)&quot;)]" />
      <HeaderLines Include="[assembly: AssemblyCopyright(&quot;$(AssemblyCopyright)&quot;)]" />
-      <HeaderLines Include="[assembly: AssemblyProduct(&quot;$(AssemblyTitle)&quot;)]" />
+      <HeaderLines Include="[assembly: AssemblyProduct(&quot;$(AssemblyProduct)&quot;)]" />
      <HeaderLines Include="[assembly: AssemblyTrademark(&quot;&quot;)]" />
      <HeaderLines Include="[assembly: AssemblyCulture(&quot;&quot;)]" />
      <HeaderLines Include="[assembly: ComVisible(false)]" />
+      <HeaderLines Include="[assembly: NeutralResourcesLanguage(&quot;en-US&quot;)]" />
      <HeaderLines Include="[assembly: AssemblyVersion(&quot;$(Version).0&quot;)]" />
      <HeaderLines Include="[assembly: AssemblyFileVersion(&quot;$(Version).0&quot;)]" />
    </ItemGroup>