Skip to content

Commit 6ff2b33

Browse files
stefansjfwstefansjfw
committed
Merge remote-tracking branch 'mainPT/main' into stefan/merge_pt_10
2 parents ce40df9 + ab7394f commit 6ff2b33

File tree

5 files changed

+78
-7
lines changed

5 files changed

+78
-7
lines changed

‎.github/actions/spell-check/expect.txt

+59-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ AFFINETRANSFORM
2626
affordances
2727
AFX
2828
AGGREGATABLE
29+
ahk
2930
AHybrid
3031
akv
32+
ALIGNRIGHT
3133
ALarger
3234
ALIGNRIGHT
3335
ALLAPPS
@@ -141,6 +143,7 @@ boxmodel
141143
BPBF
142144
bpmf
143145
bpp
146+
Breadcrumb
144147
Browsable
145148
BROWSEINFO
146149
bsd
@@ -175,6 +178,7 @@ CCom
175178
CContext
176179
CDeclaration
177180
cdn
181+
CDEF
178182
CElems
179183
CENTERALIGN
180184
certlm
@@ -273,6 +277,8 @@ cswin
273277
CTest
274278
CTEXT
275279
Ctl
280+
CTest
281+
CTEXT
276282
CTLCOLORSTATIC
277283
currentculture
278284
CURRENTDIR
@@ -360,6 +366,11 @@ DEVMODEW
360366
devpal
361367
DIALOGEX
362368
dic
369+
DEVMON
370+
DEVSOURCE
371+
DGR
372+
DIALOGEX
373+
DIIRFLAG
363374
dimm
364375
DISABLEASACTIONKEY
365376
DISABLENOSCROLL
@@ -368,6 +379,7 @@ DISPLAYCHANGE
368379
DISPLAYCONFIG
369380
DISPLAYFLAGS
370381
DISPLAYFREQUENCY
382+
DISPLAYORIENTATION
371383
displayname
372384
DISPLAYORIENTATION
373385
divyan
@@ -395,6 +407,8 @@ drivedetectionwarning
395407
Droid
396408
DROPFILES
397409
DROPTARGET
410+
DROPFILES
411+
dshow
398412
DSTINVERT
399413
DSurface
400414
DTexture
@@ -494,6 +508,7 @@ fff
494508
FILEEXPLORER
495509
FILEFLAGS
496510
FILEFLAGSMASK
511+
FILEINFOSIG
497512
FILELOCKSMITH
498513
FILELOCKSMITHCONTEXTMENU
499514
FILELOCKSMITHEXT
@@ -509,6 +524,7 @@ Filetime
509524
FILEVERSION
510525
Filterkeyboard
511526
FILTERMODE
527+
Filterx
512528
findfast
513529
Fira
514530
FIXEDFILEINFO
@@ -557,6 +573,7 @@ GETDPISCALEDSIZE
557573
getfilesiginforedist
558574
GETHOTKEY
559575
GETICON
576+
GETHOTKEY
560577
GETMINMAXINFO
561578
GETNONCLIENTMETRICS
562579
GETPROPERTYSTOREFLAGS
@@ -702,15 +719,19 @@ IGo
702719
iid
703720
Iindex
704721
Ijwhost
722+
IGNOREUNKNOWN
723+
iid
724+
Iindex
725+
Ijwhost
726+
IKs
727+
iljxck
705728
IMAGEHLP
706729
IMAGERESIZERCONTEXTMENU
707730
IMAGERESIZEREXT
708731
imageresizerinput
709732
imageresizersettings
710733
imagingdevices
711734
ime
712-
imgflip
713-
inbox
714735
INCONTACT
715736
Indo
716737
inetcpl
@@ -722,6 +743,9 @@ INITDIALOG
722743
INITGUID
723744
INITTOLOGFONTSTRUCT
724745
INLINEPREFIX
746+
INITDIALOG
747+
INITGUID
748+
INITTOLOGFONTSTRUCT
725749
inorder
726750
INPC
727751
inproc
@@ -793,6 +817,7 @@ KILLFOCUS
793817
killrunner
794818
kinda
795819
kmph
820+
KSPROPERTY
796821
Kybd
797822
lastcodeanalysissucceeded
798823
Lastdevice
@@ -802,6 +827,7 @@ LCIDTo
802827
Lclean
803828
Ldone
804829
Ldr
830+
ldx
805831
LEFTSCROLLBAR
806832
LEFTTEXT
807833
LError
@@ -818,6 +844,7 @@ LINKOVERLAY
818844
LINQTo
819845
listview
820846
LIVEZOOM
847+
lld
821848
LLKH
822849
llkhf
823850
LMEM
@@ -836,6 +863,7 @@ logon
836863
LOGPIXELSX
837864
LOGPIXELSY
838865
longdate
866+
LONGLONG
839867
LONGNAMES
840868
lowlevel
841869
LOWORD
@@ -871,6 +899,7 @@ lpv
871899
LPW
872900
lpwcx
873901
lpwndpl
902+
lpv
874903
LReader
875904
LRESULT
876905
LSTATUS
@@ -880,6 +909,7 @@ lstrcpyn
880909
lstrlen
881910
LTEXT
882911
LTk
912+
LTRB
883913
LTRREADING
884914
luid
885915
LUMA
@@ -891,6 +921,8 @@ LWA
891921
lwin
892922
LZero
893923
MAGTRANSFORM
924+
majortype
925+
makecab
894926
MAKEINTRESOURCE
895927
MAKEINTRESOURCEA
896928
MAKEINTRESOURCEW
@@ -923,6 +955,7 @@ MERGEPAINT
923955
Metadatas
924956
metafile
925957
mfc
958+
mfplat
926959
Mgmt
927960
Microwaved
928961
midl
@@ -979,6 +1012,8 @@ MSIDXSPROP
9791012
msiexec
9801013
MSIFASTINSTALL
9811014
MSIHANDLE
1015+
Msimg
1016+
msiquery
9821017
MSIRESTARTMANAGERCONTROL
9831018
msixbundle
9841019
MSIXCA
@@ -1158,6 +1193,8 @@ OWMt
11581193
OWNDC
11591194
OWNERDRAWFIXED
11601195
OWRj
1196+
OWNDC
1197+
OWNERDRAWFIXED
11611198
Packagemanager
11621199
PACL
11631200
PAINTSTRUCT
@@ -1231,6 +1268,9 @@ Podcasts
12311268
POINTERID
12321269
POINTERUPDATE
12331270
Pokedex
1271+
Pnp
1272+
POINTERID
1273+
POINTERUPDATE
12341274
Popups
12351275
POPUPWINDOW
12361276
POSITIONITEM
@@ -1284,6 +1324,8 @@ projectname
12841324
PROPERTYKEY
12851325
Propset
12861326
PROPVARIANT
1327+
PROPVARIANT
1328+
propvarutil
12871329
PRTL
12881330
prvpane
12891331
psapi
@@ -1350,6 +1392,8 @@ rectp
13501392
RECTSOURCE
13511393
recyclebin
13521394
Redist
1395+
reencode
1396+
reencoded
13531397
REFCLSID
13541398
REFIID
13551399
REGCLS
@@ -1602,6 +1646,8 @@ STGM
16021646
STGMEDIUM
16031647
STICKYKEYS
16041648
sticpl
1649+
STICKYKEYS
1650+
stl
16051651
storelogo
16061652
stprintf
16071653
streamjsonrpc
@@ -1610,6 +1656,8 @@ stringtable
16101656
stringval
16111657
Strm
16121658
strret
1659+
strsafe
1660+
strutil
16131661
stscanf
16141662
sttngs
16151663
Stubless
@@ -1618,6 +1666,7 @@ STYLECHANGING
16181666
subkeys
16191667
sublang
16201668
SUBMODULEUPDATE
1669+
subquery
16211670
Superbar
16221671
sut
16231672
svchost
@@ -1691,6 +1740,7 @@ throughs
16911740
TIcon
16921741
TILEDWINDOW
16931742
TILEINFO
1743+
TILEDWINDOW
16941744
TILLSON
16951745
timedate
16961746
timediff
@@ -1704,6 +1754,7 @@ TLayout
17041754
tlb
17051755
tlbimp
17061756
tlc
1757+
TMPVAR
17071758
TNP
17081759
Toolhelp
17091760
toolkitconverters
@@ -1794,6 +1845,7 @@ vcgtq
17941845
VCINSTALLDIR
17951846
Vcpkg
17961847
VCRT
1848+
VCENTER
17971849
vcruntime
17981850
vcvars
17991851
VDesktop
@@ -1809,6 +1861,11 @@ vget
18091861
vgetq
18101862
videourl
18111863
viewmodel
1864+
vid
1865+
VIDCAP
1866+
VIDEOINFOHEADER
1867+
viewmodel
1868+
vih
18121869
VIRTKEY
18131870
VIRTUALDESK
18141871
VISEGRADRELAY

‎.pipelines/v2/templates/job-build-project.yml

+7
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,13 @@ jobs:
205205
- ${{ if eq(parameters.useLatestWinAppSDK, false)}}:
206206
- template: .\steps-restore-nuget.yml
207207

208+
- pwsh: |-
209+
& "$(build.sourcesdirectory)\.pipelines\verifyAndSetLatestVCToolsVersion.ps1"
210+
displayName: Work around DD-1541167 (VCToolsVersion)
211+
${{ if eq(parameters.useVSPreview, true) }}:
212+
env:
213+
VCWhereExtraVersionTarget: '-prerelease'
214+
208215
- pwsh: |-
209216
& "$(build.sourcesdirectory)\.pipelines\installWiX.ps1"
210217
displayName: Download and install WiX 3.14 development build

‎.pipelines/verifyAndSetLatestVCToolsVersion.ps1

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
$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))
2+
$VSPackages = $VSInstances.instances.instance.packages.package
3+
$LatestVCPackage = ($VSInstances.instances.instance.packages.package | ? { $_.id -eq "Microsoft.VisualCpp.Tools.Core" })
4+
$LatestVCToolsVersion = $LatestVCPackage.version;
5+
Write-Output "Latest VCToolsVersion: $LatestVCToolsVersion"
6+
Write-Output "Updating VCToolsVersion environment variable for job"
7+
Write-Output "##vso[task.setvariable variable=VCToolsVersion]$LatestVCToolsVersion"

‎PowerToys.sln

+4-4
Original file line numberDiff line numberDiff line change
@@ -696,14 +696,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Ext.Shell"
696696
EndProject
697697
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}"
698698
EndProject
699-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.UnitTests", "src\modules\AdvancedPaste\AdvancedPaste.UnitTests\AdvancedPaste.UnitTests.csproj", "{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}"
700-
EndProject
701699
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}"
702700
EndProject
703-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.FuzzTests", "src\modules\AdvancedPaste\AdvancedPaste.FuzzTests\AdvancedPaste.FuzzTests.csproj", "{7F5B9557-5878-4438-A721-3E28296BA193}"
704-
EndProject
705701
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}"
706702
EndProject
703+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.UnitTests", "src\modules\AdvancedPaste\AdvancedPaste.UnitTests\AdvancedPaste.UnitTests.csproj", "{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE}"
704+
EndProject
705+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedPaste.FuzzTests", "src\modules\AdvancedPaste\AdvancedPaste.FuzzTests\AdvancedPaste.FuzzTests.csproj", "{7F5B9557-5878-4438-A721-3E28296BA193}"
706+
EndProject
707707
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ZoomIt", "ZoomIt", "{DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}"
708708
EndProject
709709
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZoomIt", "src\modules\ZoomIt\ZoomIt\ZoomIt.vcxproj", "{0A84F764-3A88-44CD-AA96-41BDBD48627B}"

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ In this release, we focused on new features, stability, and improvements.
220220
- Updated many .NET packages from .NET 9.0.0 to 9.0.1 for security fixes. Thanks [@snickler](https://github.com/snickler)!
221221
- Refactored the Mouse Without Borders Common.Log.cs and Common.Receiver.cs files. Thanks [@mikeclayton](https://github.com/mikeclayton)!
222222

223-
#### What is being planned for version 0.88
223+
#### What is being planned for version 0.89
224224

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

0 commit comments

Comments
 (0)