mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-04 10:16:24 +02:00
740dbf5699
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request Update project references across multiple projects to utilize `$(RepoRoot)` for paths, ensuring consistency and improving maintainability. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] Closes: N/A - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [x] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed, or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments This change affects the following projects: - `src/common/ManagedCsWin32/ManagedCsWin32.csproj` - `src/common/Common.Search/Common.Search.csproj` - `src/common/AllExperiments/AllExperiments.csproj` - `src/modules/peek/Peek.Common/Peek.Common.csproj` - `src/common/UITestAutomation/UITestAutomation.csproj` - `src/common/GPOWrapperProjection/GPOWrapperProjection.csproj` - `src/modules/powerrename/PowerRenameUITest/PowerRename.UITests.csproj` - `src/common/LanguageModelProvider/LanguageModelProvider.csproj` - `src/modules/Hosts/Hosts.Tests/HostsEditor.UnitTests.csproj` - `tools/StylesReportTool/StylesReportTool.vcxproj` - `src/common/interop/interop-tests/Common.Interop.UnitTests.csproj` - `tools/MonitorReportTool/MonitorReportTool.vcxproj` - `src/common/ManagedTelemetry/Telemetry/ManagedTelemetry.csproj` - `src/modules/peek/Peek.FilePreviewer/Peek.FilePreviewer.csproj` - `src/settings-ui/Settings.UI.Controls/Settings.UI.Controls.csproj` - `src/common/Themes/Themes.vcxproj` - `src/common/COMUtils/COMUtils.vcxproj` - `src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/Microsoft.CmdPal.UITests.csproj` - `src/modules/imageresizer/tests/ImageResizer.UnitTests.csproj` The changes were validated by running existing unit tests, which all passed successfully. <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed Executed all unit tests related to the modified projects, confirming that all tests passed without issues. ```
179 lines
9.6 KiB
XML
179 lines
9.6 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
<Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
|
|
<Exec Command="powershell -NonInteractive -executionpolicy Unrestricted ..\..\tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h runner.base.rc runner.rc" />
|
|
</Target>
|
|
<PropertyGroup>
|
|
<NoWarn>81010002</NoWarn>
|
|
</PropertyGroup>
|
|
<PropertyGroup Label="NuGet">
|
|
<!-- Tell NuGet this is PackageReference style -->
|
|
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
|
|
<!-- Tell NuGet we're a native project -->
|
|
<NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
|
|
<!-- Tell NuGet we target Windows (use your existing WindowsTargetPlatformVersion) -->
|
|
<NuGetTargetPlatformIdentifier>Windows</NuGetTargetPlatformIdentifier>
|
|
<NuGetTargetPlatformVersion>$(WindowsTargetPlatformVersion)</NuGetTargetPlatformVersion>
|
|
</PropertyGroup>
|
|
<PropertyGroup Label="Globals">
|
|
<VCProjectVersion>15.0</VCProjectVersion>
|
|
<ProjectGuid>{9412D5C6-2CF2-4FC2-A601-B55508EA9B27}</ProjectGuid>
|
|
<RootNamespace>powertoys</RootNamespace>
|
|
<ProjectName>runner</ProjectName>
|
|
</PropertyGroup>
|
|
<ItemGroup>
|
|
<PackageReference Include="Microsoft.WindowsAppSDK" GeneratePathProperty="true" />
|
|
<PackageReference Include="Microsoft.WindowsAppSDK.Foundation" GeneratePathProperty="true" />
|
|
<PackageReference Include="Microsoft.Windows.CppWinRT" GeneratePathProperty="true" />
|
|
<PackageReference Include="Microsoft.Windows.ImplementationLibrary" GeneratePathProperty="true" />
|
|
</ItemGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
<Import Project="$(RepoRoot)deps\expected.props" />
|
|
<ImportGroup Label="Shared" />
|
|
<PropertyGroup Label="Configuration">
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
|
|
<WindowsPackageType>None</WindowsPackageType>
|
|
<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
|
|
<WindowsAppSdkUndockedRegFreeWinRTInitialize>true</WindowsAppSdkUndockedRegFreeWinRTInitialize>
|
|
</PropertyGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
<ImportGroup Label="PropertySheets">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
</ImportGroup>
|
|
<PropertyGroup Label="UserMacros" />
|
|
<PropertyGroup>
|
|
<TargetName>PowerToys</TargetName>
|
|
</PropertyGroup>
|
|
<ItemDefinitionGroup>
|
|
<ClCompile>
|
|
<AdditionalIncludeDirectories>..\common\inc;..\common\os-detection;..\common\Telemetry;..;..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
</ClCompile>
|
|
<Link>
|
|
<UACExecutionLevel>AsInvoker</UACExecutionLevel>
|
|
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
|
<AdditionalDependencies>Shcore.lib;gdiplus.lib;Msi.lib;WindowsApp.lib;taskschd.lib;Rstrtmgr.lib;Shlwapi.lib;dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
</Link>
|
|
<Manifest>
|
|
<EnableDpiAwareness>false</EnableDpiAwareness>
|
|
</Manifest>
|
|
</ItemDefinitionGroup>
|
|
<ItemGroup>
|
|
<ClCompile Include="..\common\interop\two_way_pipe_message_ipc.cpp" />
|
|
<ClCompile Include="auto_start_helper.cpp" />
|
|
<ClCompile Include="bug_report.cpp" />
|
|
<ClCompile Include="centralized_hotkeys.cpp" />
|
|
<ClCompile Include="general_settings.cpp" />
|
|
<ClCompile Include="hotkey_conflict_detector.cpp" />
|
|
<ClCompile Include="pch.cpp">
|
|
<PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
|
|
</ClCompile>
|
|
<ClCompile Include="powertoy_module.cpp" />
|
|
<ClCompile Include="main.cpp" />
|
|
<ClCompile Include="quick_access_host.cpp" />
|
|
<ClCompile Include="restart_elevated.cpp" />
|
|
<ClCompile Include="centralized_kb_hook.cpp" />
|
|
<ClCompile Include="settings_telemetry.cpp" />
|
|
<ClCompile Include="settings_window.cpp" />
|
|
<ClCompile Include="trace.cpp" />
|
|
<ClCompile Include="tray_icon.cpp" />
|
|
<ClCompile Include="unhandled_exception_handler.cpp" />
|
|
<ClCompile Include="UpdateUtils.cpp" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<ClInclude Include="ActionRunnerUtils.h" />
|
|
<ClInclude Include="ai_detection.h" />
|
|
<ClInclude Include="auto_start_helper.h" />
|
|
<ClInclude Include="bug_report.h" />
|
|
<ClInclude Include="centralized_hotkeys.h" />
|
|
<ClInclude Include="quick_access_host.h" />
|
|
<ClInclude Include="general_settings.h" />
|
|
<ClInclude Include="hotkey_conflict_detector.h" />
|
|
<ClInclude Include="pch.h" />
|
|
<ClInclude Include="centralized_kb_hook.h" />
|
|
<ClInclude Include="settings_telemetry.h" />
|
|
<ClInclude Include="UpdateUtils.h" />
|
|
<ClInclude Include="powertoy_module.h" />
|
|
<ClInclude Include="resource.h" />
|
|
<ClInclude Include="restart_elevated.h" />
|
|
<ClInclude Include="settings_window.h" />
|
|
<ClInclude Include="trace.h" />
|
|
<ClInclude Include="tray_icon.h" />
|
|
<ClInclude Include="unhandled_exception_handler.h" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<None Include="runner.base.rc" />
|
|
<ResourceCompile Include="Generated Files/runner.rc" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<CopyFileToFolders Include="svgs\icon.ico">
|
|
<DeploymentContent>true</DeploymentContent>
|
|
<FileType>Document</FileType>
|
|
<DestinationFolders>$(OutDir)\svgs</DestinationFolders>
|
|
</CopyFileToFolders>
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<ProjectReference Include="..\common\COMUtils\COMUtils.vcxproj">
|
|
<Project>{7319089e-46d6-4400-bc65-e39bdf1416ee}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="..\common\Display\Display.vcxproj">
|
|
<Project>{caba8dfb-823b-4bf2-93ac-3f31984150d9}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="..\common\logger\logger.vcxproj">
|
|
<Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="..\common\notifications\notifications.vcxproj">
|
|
<Project>{1d5be09d-78c0-4fd7-af00-ae7c1af7c525}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="..\common\Telemetry\EtwTrace\EtwTrace.vcxproj">
|
|
<Project>{8f021b46-362b-485c-bfba-ccf83e820cbd}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="..\common\Themes\Themes.vcxproj">
|
|
<Project>{98537082-0fdb-40de-abd8-0dc5a4269bab}</Project>
|
|
</ProjectReference>
|
|
<ProjectReference Include="..\common\updating\updating.vcxproj">
|
|
<Project>{17da04df-e393-4397-9cf0-84dabe11032e}</Project>
|
|
</ProjectReference>
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<Manifest Include="PowerToys.exe.manifest" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<EmbeddedResource Include="Resources.resx" />
|
|
</ItemGroup>
|
|
<ItemGroup>
|
|
<CopyFileToFolders Include="svgs\PowerToysDark.ico">
|
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
|
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
|
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(OutDir)\svgs</DestinationFolders>
|
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(OutDir)\svgs</DestinationFolders>
|
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\svgs</DestinationFolders>
|
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\svgs</DestinationFolders>
|
|
</CopyFileToFolders>
|
|
<CopyFileToFolders Include="svgs\PowerToysWhite.ico">
|
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
|
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
|
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
|
|
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
|
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(OutDir)\svgs</DestinationFolders>
|
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(OutDir)\svgs</DestinationFolders>
|
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)\svgs</DestinationFolders>
|
|
<DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)\svgs</DestinationFolders>
|
|
</CopyFileToFolders>
|
|
</ItemGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
<Import Project="$(RepoRoot)deps\spdlog.props" />
|
|
<!-- Deduplicate WindowsAppRuntimeAutoInitializer.cpp (added twice via transitive imports causing LNK4042). Remove all then add exactly once. -->
|
|
<Target Name="FixWinAppSDKAutoInitializer" BeforeTargets="ClCompile" AfterTargets="WindowsAppRuntimeAutoInitializer">
|
|
<ItemGroup>
|
|
<!-- Remove ALL injected versions of the file -->
|
|
<ClCompile Remove="@(ClCompile)" Condition="'%(Filename)' == 'WindowsAppRuntimeAutoInitializer'" />
|
|
<!-- Add ONE copy back manually -->
|
|
<ClCompile Include="$(PkgMicrosoft_WindowsAppSDK_Foundation)\include\WindowsAppRuntimeAutoInitializer.cpp">
|
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
|
</ClCompile>
|
|
</ItemGroup>
|
|
</Target>
|
|
</Project> |