Skip to content

Commit

Permalink
Merge remote-tracking branch 'mainPT/main' into stefan/merge_pt_10
Browse files Browse the repository at this point in the history
  • Loading branch information
@stefansjfw
stefansjfw committed Feb 4, 2025
2 parents ce40df9 + ab7394f commit 6ff2b33
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 7 deletions.
61 changes: 59 additions & 2 deletions .github/actions/spell-check/expect.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ AFFINETRANSFORM
affordances
AFX
AGGREGATABLE
ahk
AHybrid
akv
ALIGNRIGHT
ALarger
ALIGNRIGHT
ALLAPPS
Expand Down Expand Up @@ -141,6 +143,7 @@ boxmodel
BPBF
bpmf
bpp
Breadcrumb
Browsable
BROWSEINFO
bsd
Expand Down Expand Up @@ -175,6 +178,7 @@ CCom
CContext
CDeclaration
cdn
CDEF
CElems
CENTERALIGN
certlm
Expand Down Expand Up @@ -273,6 +277,8 @@ cswin
CTest
CTEXT
Ctl
CTest
CTEXT
CTLCOLORSTATIC
currentculture
CURRENTDIR
Expand Down Expand Up @@ -360,6 +366,11 @@ DEVMODEW
devpal
DIALOGEX
dic
DEVMON
DEVSOURCE
DGR
DIALOGEX
DIIRFLAG
dimm
DISABLEASACTIONKEY
DISABLENOSCROLL
Expand All @@ -368,6 +379,7 @@ DISPLAYCHANGE
DISPLAYCONFIG
DISPLAYFLAGS
DISPLAYFREQUENCY
DISPLAYORIENTATION
displayname
DISPLAYORIENTATION
divyan
Expand Down Expand Up @@ -395,6 +407,8 @@ drivedetectionwarning
Droid
DROPFILES
DROPTARGET
DROPFILES
dshow
DSTINVERT
DSurface
DTexture
Expand Down Expand Up @@ -494,6 +508,7 @@ fff
FILEEXPLORER
FILEFLAGS
FILEFLAGSMASK
FILEINFOSIG
FILELOCKSMITH
FILELOCKSMITHCONTEXTMENU
FILELOCKSMITHEXT
Expand All @@ -509,6 +524,7 @@ Filetime
FILEVERSION
Filterkeyboard
FILTERMODE
Filterx
findfast
Fira
FIXEDFILEINFO
Expand Down Expand Up @@ -557,6 +573,7 @@ GETDPISCALEDSIZE
getfilesiginforedist
GETHOTKEY
GETICON
GETHOTKEY
GETMINMAXINFO
GETNONCLIENTMETRICS
GETPROPERTYSTOREFLAGS
Expand Down Expand Up @@ -702,15 +719,19 @@ IGo
iid
Iindex
Ijwhost
IGNOREUNKNOWN
iid
Iindex
Ijwhost
IKs
iljxck
IMAGEHLP
IMAGERESIZERCONTEXTMENU
IMAGERESIZEREXT
imageresizerinput
imageresizersettings
imagingdevices
ime
imgflip
inbox
INCONTACT
Indo
inetcpl
Expand All @@ -722,6 +743,9 @@ INITDIALOG
INITGUID
INITTOLOGFONTSTRUCT
INLINEPREFIX
INITDIALOG
INITGUID
INITTOLOGFONTSTRUCT
inorder
INPC
inproc
Expand Down Expand Up @@ -793,6 +817,7 @@ KILLFOCUS
killrunner
kinda
kmph
KSPROPERTY
Kybd
lastcodeanalysissucceeded
Lastdevice
Expand All @@ -802,6 +827,7 @@ LCIDTo
Lclean
Ldone
Ldr
ldx
LEFTSCROLLBAR
LEFTTEXT
LError
Expand All @@ -818,6 +844,7 @@ LINKOVERLAY
LINQTo
listview
LIVEZOOM
lld
LLKH
llkhf
LMEM
Expand All @@ -836,6 +863,7 @@ logon
LOGPIXELSX
LOGPIXELSY
longdate
LONGLONG
LONGNAMES
lowlevel
LOWORD
Expand Down Expand Up @@ -871,6 +899,7 @@ lpv
LPW
lpwcx
lpwndpl
lpv
LReader
LRESULT
LSTATUS
Expand All @@ -880,6 +909,7 @@ lstrcpyn
lstrlen
LTEXT
LTk
LTRB
LTRREADING
luid
LUMA
Expand All @@ -891,6 +921,8 @@ LWA
lwin
LZero
MAGTRANSFORM
majortype
makecab
MAKEINTRESOURCE
MAKEINTRESOURCEA
MAKEINTRESOURCEW
Expand Down Expand Up @@ -923,6 +955,7 @@ MERGEPAINT
Metadatas
metafile
mfc
mfplat
Mgmt
Microwaved
midl
Expand Down Expand Up @@ -979,6 +1012,8 @@ MSIDXSPROP
msiexec
MSIFASTINSTALL
MSIHANDLE
Msimg
msiquery
MSIRESTARTMANAGERCONTROL
msixbundle
MSIXCA
Expand Down Expand Up @@ -1158,6 +1193,8 @@ OWMt
OWNDC
OWNERDRAWFIXED
OWRj
OWNDC
OWNERDRAWFIXED
Packagemanager
PACL
PAINTSTRUCT
Expand Down Expand Up @@ -1231,6 +1268,9 @@ Podcasts
POINTERID
POINTERUPDATE
Pokedex
Pnp
POINTERID
POINTERUPDATE
Popups
POPUPWINDOW
POSITIONITEM
Expand Down Expand Up @@ -1284,6 +1324,8 @@ projectname
PROPERTYKEY
Propset
PROPVARIANT
PROPVARIANT
propvarutil
PRTL
prvpane
psapi
Expand Down Expand Up @@ -1350,6 +1392,8 @@ rectp
RECTSOURCE
recyclebin
Redist
reencode
reencoded
REFCLSID
REFIID
REGCLS
Expand Down Expand Up @@ -1602,6 +1646,8 @@ STGM
STGMEDIUM
STICKYKEYS
sticpl
STICKYKEYS
stl
storelogo
stprintf
streamjsonrpc
Expand All @@ -1610,6 +1656,8 @@ stringtable
stringval
Strm
strret
strsafe
strutil
stscanf
sttngs
Stubless
Expand All @@ -1618,6 +1666,7 @@ STYLECHANGING
subkeys
sublang
SUBMODULEUPDATE
subquery
Superbar
sut
svchost
Expand Down Expand Up @@ -1691,6 +1740,7 @@ throughs
TIcon
TILEDWINDOW
TILEINFO
TILEDWINDOW
TILLSON
timedate
timediff
Expand All @@ -1704,6 +1754,7 @@ TLayout
tlb
tlbimp
tlc
TMPVAR
TNP
Toolhelp
toolkitconverters
Expand Down Expand Up @@ -1794,6 +1845,7 @@ vcgtq
VCINSTALLDIR
Vcpkg
VCRT
VCENTER
vcruntime
vcvars
VDesktop
Expand All @@ -1809,6 +1861,11 @@ vget
vgetq
videourl
viewmodel
vid
VIDCAP
VIDEOINFOHEADER
viewmodel
vih
VIRTKEY
VIRTUALDESK
VISEGRADRELAY
Expand Down
7 changes: 7 additions & 0 deletions .pipelines/v2/templates/job-build-project.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,13 @@ jobs:
- ${{ if eq(parameters.useLatestWinAppSDK, false)}}:
- template: .\steps-restore-nuget.yml

- pwsh: |-
& "$(build.sourcesdirectory)\.pipelines\verifyAndSetLatestVCToolsVersion.ps1"
displayName: Work around DD-1541167 (VCToolsVersion)
${{ if eq(parameters.useVSPreview, true) }}:
env:
VCWhereExtraVersionTarget: '-prerelease'
- pwsh: |-
& "$(build.sourcesdirectory)\.pipelines\installWiX.ps1"
displayName: Download and install WiX 3.14 development build
Expand Down
7 changes: 7 additions & 0 deletions .pipelines/verifyAndSetLatestVCToolsVersion.ps1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
$VSInstances = ([xml](& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -include packages -format xml))
$VSPackages = $VSInstances.instances.instance.packages.package
$LatestVCPackage = ($VSInstances.instances.instance.packages.package | ? { $_.id -eq "Microsoft.VisualCpp.Tools.Core" })
$LatestVCToolsVersion = $LatestVCPackage.version;
Write-Output "Latest VCToolsVersion: $LatestVCToolsVersion"
Write-Output "Updating VCToolsVersion environment variable for job"
Write-Output "##vso[task.setvariable variable=VCToolsVersion]$LatestVCToolsVersion"
8 changes: 4 additions & 4 deletions PowerToys.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -696,14 +696,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Shell"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.WindowWalker", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.WindowWalker\Microsoft.CmdPal.Ext.WindowWalker.csproj", "{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.UnitTests", "src\modules\AdvancedPaste\AdvancedPaste.UnitTests\AdvancedPaste.UnitTests.csproj", "{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WebSearch", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.WebSearch\Microsoft.CmdPal.Ext.WebSearch.csproj", "{605E914B-7232-4789-AF46-BF5D3DDFC14E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.FuzzTests", "src\modules\AdvancedPaste\AdvancedPaste.FuzzTests\AdvancedPaste.FuzzTests.csproj", "{7F5B9557-5878-4438-A721-3E28296BA193}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WinGet", "src\modules\cmdpal\Exts\Microsoft.CmdPal.Ext.WinGet\Microsoft.CmdPal.Ext.WinGet.csproj", "{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.UnitTests", "src\modules\AdvancedPaste\AdvancedPaste.UnitTests\AdvancedPaste.UnitTests.csproj", "{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.FuzzTests", "src\modules\AdvancedPaste\AdvancedPaste.FuzzTests\AdvancedPaste.FuzzTests.csproj", "{7F5B9557-5878-4438-A721-3E28296BA193}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ZoomIt", "ZoomIt", "{DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoomIt", "src\modules\ZoomIt\ZoomIt\ZoomIt.vcxproj", "{0A84F764-3A88-44CD-AA96-41BDBD48627B}"
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ In this release, we focused on new features, stability, and improvements.
- Updated many .NET packages from .NET 9.0.0 to 9.0.1 for security fixes. Thanks [@snickler](https://github.com/snickler)!
- Refactored the Mouse Without Borders Common.Log.cs and Common.Receiver.cs files. Thanks [@mikeclayton](https://github.com/mikeclayton)!

#### What is being planned for version 0.88
#### What is being planned for version 0.89

For [v0.89][github-next-release-work], we'll work on the items below:

Expand Down

1 comment on commit 6ff2b33

@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 (2)

imgflip
inbox

These words are not needed and should be removed ahk AVery Breadcrumb CDEF DEVMON DEVSOURCE DGR DIIRFLAG dshow FILEINFOSIG Filterx IKs iljxck KSPROPERTY ldx lld LONGLONG LTRB majortype makecab mfplat Msimg msiquery mtu Pnp propvarutil reencode reencoded rsdk stl strsafe strutil subquery TMPVAR vid VIDCAP VIDEOINFOHEADER vih

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

... in a clone of the [email protected]:zadjii-msft/PowerToys.git repository
on the stefan/merge_pt_10 branch (ℹ️ how do I use this?):

curl -s -S -L 'https://raw.githubusercontent.com/check-spelling/check-spelling/v0.0.24/apply.pl' |
perl - 'https://github.com/zadjii-msft/PowerToys/actions/runs/13139234689/attempts/1'
Errors (1)

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

❌ Errors Count
❌ ignored-expect-variant 5

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.