Skip to content

Commit

Permalink
Merge branch 'dev/cmdpal/main' of https://github.com/microsoft/powertoys
Browse files Browse the repository at this point in the history 
 into dev/cmdpal/main
  • Loading branch information
@crutkas
crutkas committed Aug 27, 2024
2 parents 91b7e96 + b3b26b4 commit 3890d38
Show file tree
Hide file tree
Showing 20 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/modules/cmdpal/WindowsCommandPalette.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...ette/Microsoft.Terminal.UI/Converters.cpp → .../src/Microsoft.Terminal.UI/Converters.cpp
View file
File renamed without changes.
0 ...alette/Microsoft.Terminal.UI/Converters.h → ...al/src/Microsoft.Terminal.UI/Converters.h
View file
File renamed without changes.
0 ...ette/Microsoft.Terminal.UI/Converters.idl → .../src/Microsoft.Terminal.UI/Converters.idl
View file
File renamed without changes.
0 ...rosoft.Terminal.UI/IDirectKeyListener.idl → ...rosoft.Terminal.UI/IDirectKeyListener.idl
View file
File renamed without changes.
0 ...crosoft.Terminal.UI/IconPathConverter.cpp → ...crosoft.Terminal.UI/IconPathConverter.cpp
View file
File renamed without changes.
0 ...Microsoft.Terminal.UI/IconPathConverter.h → ...Microsoft.Terminal.UI/IconPathConverter.h
View file
File renamed without changes.
0 ...crosoft.Terminal.UI/IconPathConverter.idl → ...crosoft.Terminal.UI/IconPathConverter.idl
View file
File renamed without changes.
0 ...oft.Terminal.UI/Microsoft.Terminal.UI.def → ...oft.Terminal.UI/Microsoft.Terminal.UI.def
View file
File renamed without changes.
20 changes: 10 additions & 10 deletions ...Terminal.UI/Microsoft.Terminal.UI.vcxproj → ...Terminal.UI/Microsoft.Terminal.UI.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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>
Expand Down
0 .../Microsoft.Terminal.UI/ResourceString.cpp → .../Microsoft.Terminal.UI/ResourceString.cpp
View file
File renamed without changes.
0 ...te/Microsoft.Terminal.UI/ResourceString.h → ...rc/Microsoft.Terminal.UI/ResourceString.h
View file
File renamed without changes.
0 .../Microsoft.Terminal.UI/ResourceString.idl → .../Microsoft.Terminal.UI/ResourceString.idl
View file
File renamed without changes.
0 ...andPalette/Microsoft.Terminal.UI/init.cpp → ...cmdpal/src/Microsoft.Terminal.UI/init.cpp
View file
File renamed without changes.
0 ...tte/Microsoft.Terminal.UI/packages.config → ...src/Microsoft.Terminal.UI/packages.config
View file
File renamed without changes.
0 ...mandPalette/Microsoft.Terminal.UI/pch.cpp → .../cmdpal/src/Microsoft.Terminal.UI/pch.cpp
View file
File renamed without changes.
0 ...ommandPalette/Microsoft.Terminal.UI/pch.h → ...es/cmdpal/src/Microsoft.Terminal.UI/pch.h
View file
File renamed without changes.
0 ...alette/Microsoft.Terminal.UI/til_string.h → ...al/src/Microsoft.Terminal.UI/til_string.h
View file
File renamed without changes.
0 ...dPalette/Microsoft.Terminal.UI/version.rc → ...dpal/src/Microsoft.Terminal.UI/version.rc
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion src/modules/cmdpal/src/WindowsCommandPalette/WindowsCommandPalette.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

1 comment on commit 3890d38

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@check-spelling-bot Report

🔴 Please review

See the 📜action log or 📝 job summary for details.

Unrecognized words (102) 
accodingly
adaptivecards
adityar
affordances
agressive
Allman
amuid
Aot
apicontract
APPMODEL
asynchonously
AVery
builttoroam
Cantarell
cazamor
chrnguyen
CLSIDs
cmdpal
commandpalette
contextitems
contractversion
cppversion
cswin
CVS
defaultlib
devcmdpal
devpal
dic
Droid
duhowett
emoji
ESPN
extensionsdk
Fira
Griese
gsl
harcoded
homies
icf
icommandprovider
icondatatype
iextn
IGo
imgflip
implementaions
inbox
INLINEPREFIX
inotifypropchanged
intederminate
kinda
libraryincludes
libucrt
libucrtd
listitems
lmao
localappdata
LUQ
MBM
meme
memicmp
Microwavable
migrie
minwindef
mobileredirect
mtu
nicksnettravels
NOCOMM
NOMCX
nonspace
nullness
packagesource
Podcasts
Puser
Quicklinks
Rasterization
rsdk
seperately
seperators
SFBS
sharepoint
sharpcorner
sooon
sourcedoc
Spongebob
spongebot
stdcpp
syncronously
TIcon
ucrt
ucrtd
vcxitems
VExtension
vkey
vulnerbilities
wbin
wic
wikimedia
WSB
WUX
xclip
xdoc
ycombinator
Previously acknowledged words that are now absent applayout appsfolder Emoji systemsettings SYSTEMWOW USEPOSITION USESIZE VKey WIC 🫥
Some files were automatically ignored 🙈

These sample patterns would exclude them:

^\Qsrc/modules/cmdpal/exclusion.dic\E$

You should consider adding them to:

.github/actions/spell-check/excludes.txt

File matching is via Perl regular expressions.

To check these files, more of their words need to be in the dictionary than not. You can use patterns.txt to exclude portions, add items to the dictionary (e.g. by adding them to allow.txt), or fix typos.

To accept these unrecognized words as correct and remove the previously acknowledged and now absent words and update file exclusions, you could run the following commands

... in a clone of the [email protected]:microsoft/PowerToys.git repository
on the dev/cmdpal/main branch (ℹ️ how do I use this?):

curl -s -S -L 'https://raw.githubusercontent.com/check-spelling/check-spelling/v0.0.22/apply.pl' |
perl - 'https://github.com/microsoft/PowerToys/actions/runs/10586863352/attempts/1'
Available 📚 dictionaries could cover words (expected and unrecognized) not in the 📘 dictionary

This includes both expected items (1896) from .github/actions/spell-check/expect.txt and unrecognized words (102)

Dictionary Entries Covers Uniquely
cspell:r/src/r.txt 543 1 1
cspell:cpp/src/people.txt 23 1
cspell:cpp/src/ecosystem.txt 51 1

Consider adding them (in .github/workflows/spelling2.yml) for uses: check-spelling/[email protected] in its with:

      with:
        extra_dictionaries:
          cspell:r/src/r.txt
          cspell:cpp/src/people.txt
          cspell:cpp/src/ecosystem.txt

To stop checking additional dictionaries, add (in .github/workflows/spelling2.yml) for uses: check-spelling/[email protected] in its with:

check_extra_dictionaries: ''
Errors (4)

See the 📜action log or 📝 job summary for details.

❌ Errors Count
ℹ️ binary-file 1
❌ check-file-path 216
❌ forbidden-pattern 5
ℹ️ non-alpha-in-dictionary 1

See ❌ Event descriptions for more information.

If the flagged items are 🤯 false positives

If items relate to a ...

  • binary file (or some other file you wouldn't want to check at all).

    Please add a file path to the excludes.txt file matching the containing file.

    File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

    ^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

  • well-formed pattern.

    If you can write a pattern that would match it,
    try adding it to the patterns.txt file.

    Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

    Note that patterns can't match multiline strings.

Please sign in to comment.