Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-02-23 19:49:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev/cmdpal/main' of https://github.com/microsoft/powertoys into dev/cmdpal/main

Browse Source
This commit is contained in:
Clint Rutkas
2024-08-27 15:33:20 -07:00
parent 91b7e96bdb b3b26b4f69
commit 3890d385e7
20 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/cmdpal/WindowsCommandPalette.sln
View File

@@ -10,7 +10,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AllApps", "src\BuiltinComma
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Builtins", "Builtins", "{B7FF739F-7716-4FC3-B622-705486187B87}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI", "src\WindowsCommandPalette\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj", "{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI", "src\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj", "{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extension SDK", "Extension SDK", "{FAA24D36-5515-467C-91E7-101A189AAF48}"
EndProject

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Converters.cpp → src/modules/cmdpal/src/Microsoft.Terminal.UI/Converters.cpp
View File

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Converters.h → src/modules/cmdpal/src/Microsoft.Terminal.UI/Converters.h
View File

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Converters.idl → src/modules/cmdpal/src/Microsoft.Terminal.UI/Converters.idl
View File

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/IDirectKeyListener.idl → src/modules/cmdpal/src/Microsoft.Terminal.UI/IDirectKeyListener.idl
View File

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/IconPathConverter.cpp → src/modules/cmdpal/src/Microsoft.Terminal.UI/IconPathConverter.cpp
View File

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/IconPathConverter.h → src/modules/cmdpal/src/Microsoft.Terminal.UI/IconPathConverter.h
View File

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/IconPathConverter.idl → src/modules/cmdpal/src/Microsoft.Terminal.UI/IconPathConverter.idl
View File

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Microsoft.Terminal.UI.def → src/modules/cmdpal/src/Microsoft.Terminal.UI/Microsoft.Terminal.UI.def
View File

20
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj → src/modules/cmdpal/src/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" />
<Import Project="..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
<Import Project="..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" />
<Import Project="..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
<PropertyGroup Label="Globals">
<CppWinRTOptimized>true</CppWinRTOptimized>
@@ -256,20 +256,20 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" />
<Import Project="..\..\..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
<Import Project="..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
<Import Project="..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" />
<Import Project="..\..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
<Error Condition="!Exists('..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.props'))" />
<Error Condition="!Exists('..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\packages\Microsoft.WindowsAppSDK.1.5.240428000\build\native\Microsoft.WindowsAppSDK.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
</Target>
<ItemGroup>

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/ResourceString.cpp → src/modules/cmdpal/src/Microsoft.Terminal.UI/ResourceString.cpp
View File

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/ResourceString.h → src/modules/cmdpal/src/Microsoft.Terminal.UI/ResourceString.h
View File

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/ResourceString.idl → src/modules/cmdpal/src/Microsoft.Terminal.UI/ResourceString.idl
View File

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/init.cpp → src/modules/cmdpal/src/Microsoft.Terminal.UI/init.cpp
View File

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/packages.config → src/modules/cmdpal/src/Microsoft.Terminal.UI/packages.config
View File

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/pch.cpp → src/modules/cmdpal/src/Microsoft.Terminal.UI/pch.cpp
View File

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/pch.h → src/modules/cmdpal/src/Microsoft.Terminal.UI/pch.h
View File

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/til_string.h → src/modules/cmdpal/src/Microsoft.Terminal.UI/til_string.h
View File

0
src/modules/cmdpal/src/WindowsCommandPalette/Microsoft.Terminal.UI/version.rc → src/modules/cmdpal/src/Microsoft.Terminal.UI/version.rc
View File

2
src/modules/cmdpal/src/WindowsCommandPalette/WindowsCommandPalette.csproj
View File

@@ -78,7 +78,7 @@
<ProjectReference Include="..\BuiltinCommands\AllApps\AllApps.csproj" />
<ProjectReference Include="..\BuiltinCommands\Calculator\Calculator.csproj" />
<ProjectReference Include="..\common\CmdPal.Common.csproj" />
<ProjectReference Include="Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj">
<ProjectReference Include="..\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj">
<ReferenceOutputAssembly>True</ReferenceOutputAssembly>
<Private>True</Private>
<CopyLocalSatelliteAssemblies>True</CopyLocalSatelliteAssemblies>