Added info to FancyZones, KeyboardManager and PowerLauncher projects (#4445)

2026-04-04 18:26:39 +02:00 · 2020-06-23 18:36:39 +03:00
parent ad440f70fa
commit 147c08bd71
18 changed files with 231 additions and 38 deletions
--- a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj
@@ -5,8 +5,10 @@
  <!-- We don't have GenerateAssemblyInfo task until we use .net core, so we generate it with WriteLinesToFile -->
  <PropertyGroup>
    <AssemblyTitle>FancyZonesEditor</AssemblyTitle>
+    <AssemblyDescription>PowerToys FancyZones Editor</AssemblyDescription>
    <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
-    <AssemblyCopyright>Copyright (C) 2019 Microsoft Corp.</AssemblyCopyright>
+    <AssemblyCopyright>Copyright (C) 2020 Microsoft Corporation</AssemblyCopyright>
+    <AssemblyProduct>PowerToys</AssemblyProduct>
  </PropertyGroup>
  <ItemGroup>
    <AssemblyVersionFiles Include="Generated Files\AssemblyInfo.cs" />
@@ -18,17 +20,19 @@
      <HeaderLines Include="// See the LICENSE file in the project root for more information." />
      <HeaderLines Include="#pragma warning disable SA1516" />
      <HeaderLines Include="using System.Reflection%3b" />
+      <HeaderLines Include="using System.Resources%3b" />
      <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: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]" />
      <HeaderLines Include="[assembly: AssemblyVersion(&quot;$(Version).0&quot;)]" />
      <HeaderLines Include="[assembly: AssemblyFileVersion(&quot;$(Version).0&quot;)]" />
--- a/src/modules/fancyzones/lib/fancyzones.rc
+++ b/src/modules/fancyzones/lib/fancyzones.rc
@@ -1,5 +1,4 @@
-// Microsoft Visual C++ generated resource script.
-//
+#include <windows.h>
 #include "resource.h"
 #include "../../../common/version.h"

@@ -30,33 +29,32 @@ BEGIN
    IDS_CANT_DRAG_ELEVATED                                     L"We've detected an application running with administrator privileges. This blocks some functionality in PowerToys. Visit our wiki page to learn more."
    IDS_CANT_DRAG_ELEVATED_LEARN_MORE                          L"Learn more"
    IDS_CANT_DRAG_ELEVATED_DIALOG_DONT_SHOW_AGAIN              L"Don't show again"
-
 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 0x2L
- FILESUBTYPE 0x0L
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_DLL
+ FILESUBTYPE VFT2_UNKNOWN
 BEGIN
    BLOCK "StringFileInfo"
    BEGIN
        BLOCK "040904b0"
        BEGIN
            VALUE "CompanyName", COMPANY_NAME
-            VALUE "FileDescription", "FancyZones PowerToy Module"
+            VALUE "FileDescription", FILE_DESCRIPTION
            VALUE "FileVersion", FILE_VERSION_STRING
-            VALUE "InternalName", "FancyZones PowerToy"
+            VALUE "InternalName", INTERNAL_NAME
            VALUE "LegalCopyright", COPYRIGHT_NOTE
-            VALUE "OriginalFilename", "fancyzones_powertoy.dll"
-            VALUE "ProductName", "FancyZones PowerToy"
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
            VALUE "ProductVersion", PRODUCT_VERSION_STRING
        END
    END
--- a/src/modules/fancyzones/lib/resource.h
+++ b/src/modules/fancyzones/lib/resource.h
@@ -1,3 +1,17 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by fancyzones.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys FancyZones"
+#define INTERNAL_NAME "fancyzones"
+#define ORIGINAL_FILENAME "fancyzones.dll"
+
+// Non-localizable
+//////////////////////////////
+
 #define IDS_SETTING_DESCRIPTION_SHIFTDRAG                           101
 #define IDS_SETTING_DESCRIPTION_MOUSESWITCH                         102
 #define IDS_SETTING_DESCRIPTION_OVERRIDE_SNAP_HOTKEYS               103
--- a/src/modules/fancyzones/tests/UnitTests/UnitTests-FancyZones.rc
+++ b/src/modules/fancyzones/tests/UnitTests/UnitTests-FancyZones.rc
@@ -0,0 +1,36 @@
+#include <windows.h>
+#include "resource.h"
+#include "../../../../common/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/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj
+++ b/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj
@@ -119,6 +119,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
    <ClInclude Include="Util.h" />
  </ItemGroup>
  <ItemGroup>
@@ -132,6 +133,9 @@
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="UnitTests-FancyZones.rc" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
    <Import Project="..\..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200519.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200519.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
--- a/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj.filters
+++ b/src/modules/fancyzones/tests/UnitTests/UnitTests.vcxproj.filters
@@ -50,10 +50,18 @@
    <ClInclude Include="Util.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config">
      <Filter>Source Files</Filter>
    </None>
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="UnitTests-FancyZones.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
--- a/src/modules/fancyzones/tests/UnitTests/resource.h
+++ b/src/modules/fancyzones/tests/UnitTests/resource.h
@@ -0,0 +1,13 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by UnitTests-FancyZones.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys UnitTests-FancyZones"
+#define INTERNAL_NAME "UnitTests-FancyZones"
+#define ORIGINAL_FILENAME "UnitTests-FancyZones.dll"
+
+// Non-localizable
+//////////////////////////////
--- a/src/modules/keyboardmanager/dll/KeyboardManager.rc
+++ b/src/modules/keyboardmanager/dll/KeyboardManager.rc
@@ -1,5 +1,4 @@
-// Microsoft Visual C++ generated resource script.
-//
+#include <windows.h>
 #include "resource.h"
 #include "../../../common/version.h"

@@ -12,34 +11,34 @@ END
 IDS_KEYBOARDMANAGER_ICON    ICON    L"Keyboard.ico"

 1 VERSIONINFO
- FILEVERSION 0,1,0,0
- PRODUCTVERSION 0,1,0,0
- 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 0x2L
- 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", "Keyboard Manager PowerToy Module"
+            VALUE "FileDescription", FILE_DESCRIPTION
            VALUE "FileVersion", FILE_VERSION_STRING
-            VALUE "InternalName", "Keyboard Manager PowerToy"
+            VALUE "InternalName", INTERNAL_NAME
            VALUE "LegalCopyright", COPYRIGHT_NOTE
-            VALUE "OriginalFilename", "KeyboardManager.dll"
-            VALUE "ProductName", "Keyboard Manager PowerToy"
+            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
+END
--- a/src/modules/keyboardmanager/dll/resource.h
+++ b/src/modules/keyboardmanager/dll/resource.h
@@ -1,3 +1,17 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by KeyboardManager.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys KeyboardManager"
+#define INTERNAL_NAME "KeyboardManager"
+#define ORIGINAL_FILENAME "KeyboardManager.dll"
+
+// Non-localizable
+//////////////////////////////
+
 #define IDS_SETTINGS_DESCRIPTION 101
-#define IDS_KEYBOARDMANAGER 102
-#define IDS_KEYBOARDMANAGER_ICON    103
+#define IDS_KEYBOARDMANAGER      102
+#define IDS_KEYBOARDMANAGER_ICON 103
--- a/src/modules/keyboardmanager/test/KeyboardManagerTest.rc
+++ b/src/modules/keyboardmanager/test/KeyboardManagerTest.rc
@@ -0,0 +1,36 @@
+#include <windows.h>
+#include "resource.h"
+#include "../../../common/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/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj
+++ b/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj
@@ -110,6 +110,7 @@
  <ItemGroup>
    <ClInclude Include="MockedInput.h" />
    <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
    <ClInclude Include="TestHelpers.h" />
  </ItemGroup>
  <ItemGroup>
@@ -126,6 +127,9 @@
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="KeyboardManagerTest.rc" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200602.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200602.3\build\native\Microsoft.Windows.CppWinRT.targets')" />
--- a/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj.filters
+++ b/src/modules/keyboardmanager/test/KeyboardManagerTest.vcxproj.filters
@@ -38,8 +38,16 @@
    <ClInclude Include="TestHelpers.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="KeyboardManagerTest.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
--- a/src/modules/keyboardmanager/test/resource.h
+++ b/src/modules/keyboardmanager/test/resource.h
@@ -0,0 +1,13 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by KeyboardManagerTest.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys KeyboardManagerTest"
+#define INTERNAL_NAME "KeyboardManagerTest"
+#define ORIGINAL_FILENAME "KeyboardManagerTest.dll"
+
+// Non-localizable
+//////////////////////////////
--- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc
+++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc
--- a/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters
+++ b/src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters
@@ -8,12 +8,24 @@
  <ItemGroup>
    <ClInclude Include="pch.h" />
    <ClInclude Include="trace.h" />
-    <ClInclude Include="resource.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Microsoft.Launcher.rc" />
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{5d14850e-4c90-4022-9ad1-9ca85dc4dc27}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{513da898-667d-48e4-bf15-74cf06f07ee1}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Microsoft.Launcher.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
--- a/src/modules/launcher/Microsoft.Launcher/resource.h
+++ b/src/modules/launcher/Microsoft.Launcher/resource.h
@@ -1,2 +1,16 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Microsoft.Launcher.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys Microsoft.Launcher"
+#define INTERNAL_NAME "Microsoft.Launcher"
+#define ORIGINAL_FILENAME "Microsoft.Launcher.dll"
+
+// Non-localizable
+//////////////////////////////
+
 #define IDS_LAUNCHER_NAME             601
 #define IDS_LAUNCHER_SETTINGS_DESC    602
--- a/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj
+++ b/src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj
@@ -5,6 +5,14 @@
    <Platforms>x64</Platforms>
    <PlatformTarget>x64</PlatformTarget>
    <Version>$(Version).0</Version>
+    <Authors>Microsoft Corporation</Authors>
+    <Product>PowerToys</Product>
+    <Description>PowerToys PowerLauncher 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/modules/launcher/PowerLauncher/PowerLauncher.csproj
+++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj
@@ -14,6 +14,14 @@
    <Platforms>x64</Platforms>
    <AssetTargetFallback>uap10.0.18362</AssetTargetFallback>
    <Version>$(Version).0</Version>
+    <Authors>Microsoft Corporation</Authors>
+    <Product>PowerToys</Product>
+    <Description>PowerToys PowerLauncher</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>