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

microsoft · Jun 23, 2020 · ad440f7 · ad440f7
1 parent bb22155
commit ad440f7
Show file tree

Hide file tree

Showing 26 changed files with 255 additions and 56 deletions.
diff --git 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"
 
@@ -10,34 +9,34 @@ BEGIN
 END
 
 1 VERSIONINFO
- FILEVERSION FILE_VERSION
- PRODUCTVERSION PRODUCT_VERSION
- FILEFLAGSMASK 0x3fL
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
- FILEFLAGS 0x1L
+FILEFLAGS VS_FF_DEBUG
 #else
- FILEFLAGS 0x0L
+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
diff --git 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
-
diff --git 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>

diff --git 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
diff --git 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')" />

diff --git 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>
diff --git 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
+//////////////////////////////
diff --git 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
+//////////////////////////////
diff --git a/src/common/interop/app.ico b/src/common/interop/app.ico
diff --git a/src/common/interop/app.rc b/src/common/interop/app.rc
diff --git a/src/common/interop/interop.rc b/src/common/interop/interop.rc
diff --git 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" />

diff --git 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>
diff --git a/src/common/notifications/notifications_dll.rc b/src/common/notifications/notifications_dll.rc
@@ -1,35 +1,36 @@
+#include <windows.h>
 #include "resource.h"
-#include "../../../common/version.h"
+#include "../version.h"
 
 1 VERSIONINFO
- FILEVERSION FILE_VERSION
- PRODUCTVERSION PRODUCT_VERSION
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
- FILEFLAGS VS_FF_DEBUG
+FILEFLAGS VS_FF_DEBUG
 #else
- FILEFLAGS 0x0L
+FILEFLAGS 0x0L
 #endif
- FILEOS VOS_NT_WINDOWS32
- FILETYPE VFT_DLL
- FILESUBTYPE VFT2_UNKNOWN
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN 
 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
diff --git 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
+//////////////////////////////
diff --git 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
diff --git 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>

diff --git 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>