Merge remote-tracking branch 'mainPT/main' into stefan/merge_pt_11

zadjii-msft · Feb 6, 2025 · e094c85 · e094c85
2 parents da40c44 + 629ca8b
commit e094c85
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 4 deletions.
diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
@@ -26,8 +26,10 @@ AFFINETRANSFORM
 affordances
 AFX
 AGGREGATABLE
+ahk
 AHybrid
 akv
+ALIGNRIGHT
 ALarger
 ALIGNRIGHT
 ALLAPPS
@@ -140,6 +142,7 @@ boxmodel
 BPBF
 bpmf
 bpp
+Breadcrumb
 Browsable
 BROWSEINFO
 bsd
@@ -174,6 +177,7 @@ CCom
 CContext
 CDeclaration
 cdn
+CDEF
 CElems
 CENTERALIGN
 certlm
@@ -272,6 +276,8 @@ cswin
 CTest
 CTEXT
 Ctl
+CTest
+CTEXT
 CTLCOLORSTATIC
 currentculture
 CURRENTDIR
@@ -359,6 +365,11 @@ DEVMODEW
 devpal
 DIALOGEX
 dic
+DEVMON
+DEVSOURCE
+DGR
+DIALOGEX
+DIIRFLAG
 dimm
 DISABLEASACTIONKEY
 DISABLENOSCROLL
@@ -367,6 +378,7 @@ DISPLAYCHANGE
 DISPLAYCONFIG
 DISPLAYFLAGS
 DISPLAYFREQUENCY
+DISPLAYORIENTATION
 displayname
 DISPLAYORIENTATION
 divyan
@@ -394,6 +406,8 @@ drivedetectionwarning
 Droid
 DROPFILES
 DROPTARGET
+DROPFILES
+dshow
 DSTINVERT
 DSurface
 DTexture
@@ -493,6 +507,7 @@ fff
 FILEEXPLORER
 FILEFLAGS
 FILEFLAGSMASK
+FILEINFOSIG
 FILELOCKSMITH
 FILELOCKSMITHCONTEXTMENU
 FILELOCKSMITHEXT
@@ -508,6 +523,7 @@ Filetime
 FILEVERSION
 Filterkeyboard
 FILTERMODE
+Filterx
 findfast
 Fira
 FIXEDFILEINFO
@@ -556,6 +572,7 @@ GETDPISCALEDSIZE
 getfilesiginforedist
 GETHOTKEY
 GETICON
+GETHOTKEY
 GETMINMAXINFO
 GETNONCLIENTMETRICS
 GETPROPERTYSTOREFLAGS
@@ -701,6 +718,12 @@ IGo
 iid
 Iindex
 Ijwhost
+IGNOREUNKNOWN
+iid
+Iindex
+Ijwhost
+IKs
+iljxck
 IMAGEHLP
 IMAGERESIZERCONTEXTMENU
 IMAGERESIZEREXT
@@ -721,6 +744,9 @@ INITDIALOG
 INITGUID
 INITTOLOGFONTSTRUCT
 INLINEPREFIX
+INITDIALOG
+INITGUID
+INITTOLOGFONTSTRUCT
 inorder
 INPC
 inproc
@@ -792,6 +818,7 @@ KILLFOCUS
 killrunner
 kinda
 kmph
+KSPROPERTY
 Kybd
 lastcodeanalysissucceeded
 Lastdevice
@@ -801,6 +828,7 @@ LCIDTo
 Lclean
 Ldone
 Ldr
+ldx
 LEFTSCROLLBAR
 LEFTTEXT
 LError
@@ -817,6 +845,7 @@ LINKOVERLAY
 LINQTo
 listview
 LIVEZOOM
+lld
 LLKH
 llkhf
 LMEM
@@ -835,6 +864,7 @@ logon
 LOGPIXELSX
 LOGPIXELSY
 longdate
+LONGLONG
 LONGNAMES
 lowlevel
 LOWORD
@@ -870,6 +900,7 @@ lpv
 LPW
 lpwcx
 lpwndpl
+lpv
 LReader
 LRESULT
 LSTATUS
@@ -879,6 +910,7 @@ lstrcpyn
 lstrlen
 LTEXT
 LTk
+LTRB
 LTRREADING
 luid
 LUMA
@@ -890,6 +922,8 @@ LWA
 lwin
 LZero
 MAGTRANSFORM
+majortype
+makecab
 MAKEINTRESOURCE
 MAKEINTRESOURCEA
 MAKEINTRESOURCEW
@@ -922,6 +956,7 @@ MERGEPAINT
 Metadatas
 metafile
 mfc
+mfplat
 Mgmt
 Microwaved
 midl
@@ -978,6 +1013,8 @@ MSIDXSPROP
 msiexec
 MSIFASTINSTALL
 MSIHANDLE
+Msimg
+msiquery
 MSIRESTARTMANAGERCONTROL
 msixbundle
 MSIXCA
@@ -1156,6 +1193,8 @@ OWMt
 OWNDC
 OWNERDRAWFIXED
 OWRj
+OWNDC
+OWNERDRAWFIXED
 Packagemanager
 PACL
 PAINTSTRUCT
@@ -1229,6 +1268,9 @@ Podcasts
 POINTERID
 POINTERUPDATE
 Pokedex
+Pnp
+POINTERID
+POINTERUPDATE
 Popups
 POPUPWINDOW
 POSITIONITEM
@@ -1282,6 +1324,8 @@ projectname
 PROPERTYKEY
 Propset
 PROPVARIANT
+PROPVARIANT
+propvarutil
 PRTL
 prvpane
 psapi
@@ -1348,6 +1392,8 @@ rectp
 RECTSOURCE
 recyclebin
 Redist
+reencode
+reencoded
 REFCLSID
 REFIID
 REGCLS
@@ -1599,6 +1645,8 @@ STGM
 STGMEDIUM
 STICKYKEYS
 sticpl
+STICKYKEYS
+stl
 storelogo
 stprintf
 streamjsonrpc
@@ -1607,6 +1655,8 @@ stringtable
 stringval
 Strm
 strret
+strsafe
+strutil
 stscanf
 sttngs
 Stubless
@@ -1615,6 +1665,7 @@ STYLECHANGING
 subkeys
 sublang
 SUBMODULEUPDATE
+subquery
 Superbar
 sut
 svchost
@@ -1688,6 +1739,7 @@ throughs
 TIcon
 TILEDWINDOW
 TILEINFO
+TILEDWINDOW
 TILLSON
 timedate
 timediff
@@ -1701,6 +1753,7 @@ TLayout
 tlb
 tlbimp
 tlc
+TMPVAR
 TNP
 Toolhelp
 toolkitconverters
@@ -1791,6 +1844,7 @@ vcgtq
 VCINSTALLDIR
 Vcpkg
 VCRT
+VCENTER
 vcruntime
 vcvars
 VDesktop
@@ -1806,6 +1860,11 @@ vget
 vgetq
 videourl
 viewmodel
+vid
+VIDCAP
+VIDEOINFOHEADER
+viewmodel
+vih
 VIRTKEY
 VIRTUALDESK
 VISEGRADRELAY

diff --git a/.pipelines/v2/release.yml b/.pipelines/v2/release.yml
@@ -98,6 +98,8 @@ extends:
                 akvName: $(SigningAKVName)
                 authCertName: $(SigningAuthCertName)
                 signCertName: $(SigningSignCertName)
+                useManagedIdentity: $(SigningUseManagedIdentity)
+                clientId: $(SigningOriginalClientId)
               # Have msbuild use the release nuget config profile
               additionalBuildOptions: /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config"
               beforeBuildSteps:

diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml
@@ -195,13 +195,13 @@ jobs:
            "packages.config" | "$(Agent.OS)"
            "packages.config"
         path: packages
-
+  
   - ${{ if eq(parameters.useLatestWinAppSDK, true)}}:
     - template: .\steps-update-winappsdk-and-restore-nuget.yml
       parameters:
         versionNumber: ${{ parameters.winAppSDKVersionNumber }}
         useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
-
+  
   - ${{ if eq(parameters.useLatestWinAppSDK, false)}}:
     - template: .\steps-restore-nuget.yml
 

diff --git a/.pipelines/v2/templates/steps-esrp-signing.yml b/.pipelines/v2/templates/steps-esrp-signing.yml
@@ -19,4 +19,6 @@ steps:
       AuthAKVName: ${{ parameters.signingIdentity.akvName }}
       AuthCertName: ${{ parameters.signingIdentity.authCertName }}
       AuthSignCertName: ${{ parameters.signingIdentity.signCertName }}
+      UseMSIAuthentication: ${{ coalesce(parameters.signingIdentity.useManagedIdentity, 'false') }}
+      EsrpClientId: ${{ parameters.signingIdentity.clientId }}
       ${{ insert }}: ${{ parameters.inputs }}
diff --git a/PowerToys.sln b/PowerToys.sln
@@ -3655,10 +3655,10 @@ Global
 		{453CBB73-A3CB-4D0B-8D24-6940B86FE21D} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{C0CE3B5E-16D3-495D-B335-CA791B660162} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
 		{3A9A7297-92C4-4F16-B6F9-8D4AB652C86C} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE} = {9873BA05-4C41-4819-9283-CF45D795431B}
 		{605E914B-7232-4789-AF46-BF5D3DDFC14E} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
-		{7F5B9557-5878-4438-A721-3E28296BA193} = {9873BA05-4C41-4819-9283-CF45D795431B}
 		{E81A7D20-9862-ABDB-0AAE-9BC5B517A9F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{D5E5F5EA-1B6C-4A73-88BE-304F36C9E4EE} = {9873BA05-4C41-4819-9283-CF45D795431B}
+		{7F5B9557-5878-4438-A721-3E28296BA193} = {9873BA05-4C41-4819-9283-CF45D795431B}
 		{DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{0A84F764-3A88-44CD-AA96-41BDBD48627B} = {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}
 		{E4585179-2AC1-4D5F-A3FF-CFC5392F694C} = {DD6E12FE-5509-4ABC-ACC2-3D6DC98A238C}