GPO line in General instead

Co-authored-by: Heiko <61519853+htcfreek@users.noreply.github.com>

.github/CODEOWNERS

@@ -4,7 +4,7 @@
 /.github/actions/spell-check/
 
 # locking down pipeline folder
-/.pipelines @crutkas @DHowett @ethanfangg
+/.pipelines/ @crutkas @DHowett @ethanfangg
 
 # locking down nuget config
 nuget.config  @crutkas @DHowett @ethanfangg
@@ -12,5 +12,5 @@ packages.config  @crutkas @DHowett @ethanfangg
 
 # locking down files that should not change
 LICENSE @crutkas @DHowett @ethanfangg
-SECURITY.MD @crutkas @DHowett @ethanfangg
-CODE_OF_CONDUCT.MD @crutkas @DHowett @ethanfangg
+SECURITY.md @crutkas @DHowett @ethanfangg
+CODE_OF_CONDUCT.md @crutkas @DHowett @ethanfangg

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -65,6 +65,7 @@ body:
       - Keyboard Manager
       - Mouse Utilities
       - Mouse Without Borders
+      - New+ 
       - Peek
       - PowerRename
       - PowerToys Run
@@ -76,6 +77,7 @@ body:
       - System tray interaction
       - TextExtractor
       - Video Conference Mute
+      - Workspaces
       - Welcome / PowerToys Tour window
   validations:
     required: true

.github/ISSUE_TEMPLATE/translation_issue.yml

@@ -39,6 +39,7 @@ body:
     - Keyboard Manager
     - Mouse Utilities
     - Mouse Without Borders
+    - New+
     - Peek
     - PowerRename
     - PowerToys Run
@@ -50,6 +51,7 @@ body:
     - System tray interaction
     - TextExtractor
     - Video Conference Mute
+    - Workspaces
     - Welcome / PowerToys Tour window
   validations:
     required: true

.github/actions/spell-check/allow/names.txt

@@ -28,6 +28,7 @@ videoconference
 
 # USERS
 
+LWXpg  # (number eight)LWXpg is actual user name but spell checker throws error with a numeric leading value ... which is kinda odd
 Adoumie
 Advaith
 alekhyareddy
@@ -61,7 +62,9 @@ DHowett
 ductdo
 Essey
 ethanfangg
+ferraridavide
 frankychen
+gaardmark
 gabime
 Galaxi
 Garside
@@ -143,6 +146,7 @@ TBM
 tilovell
 Triet
 waaverecords
+Xpg
 ycv
 Yuniardi
 yuyoyuppe

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

@@ -117,6 +117,7 @@
 ^\Qsrc/modules/previewpane/UnitTests-StlThumbnailProvider/HelperFiles/sample.stl\E$
 ^\Qtools/project_template/ModuleTemplate/resource.h\E$
 ^doc/devdocs/akaLinks\.md$
+^src/modules/launcher/Plugins/Microsoft\.PowerToys\.Run\.Plugin\.TimeDate/Properties/
 ^src/modules/MouseWithoutBorders/App/.*/NativeMethods\.cs$
 ^src/modules/MouseWithoutBorders/App/Form/.*\.Designer\.cs$
 ^src/modules/MouseWithoutBorders/App/Form/.*\.resx$

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

@@ -30,6 +30,7 @@ AFX
 AGGREGATABLE
 AHybrid
 AKV
+akv
 ALarger
 ALLAPPS
 ALLINPUT
@@ -56,11 +57,14 @@ APPBARDATA
 appdata
 APPEXECLINK
 Appium
+applayout
 Applicationcan
+APPLICATIONFRAMEHOST
 appmanifest
 APPNAME
 appref
 appsettings
+appsfolder
 appwindow
 appwiz
 APSTUDIO
@@ -77,6 +81,8 @@ asf
 AShortcut
 ASingle
 ASSOCCHANGED
+ASSOCF
+ASSOCSTR
 ASYNCWINDOWPLACEMENT
 ASYNCWINDOWPOS
 atl
@@ -189,7 +195,6 @@ CLIPBOARDUPDATE
 CLIPCHILDREN
 CLIPSIBLINGS
 closesocket
-clrcall
 CLSCTX
 Clusion
 cmder
@@ -201,6 +206,7 @@ CMINVOKECOMMANDINFOEX
 CMock
 CMONITORS
 cmpgt
+cmph
 cne
 CNF
 coclass
@@ -220,7 +226,6 @@ comdlg
 comexp
 cominterop
 commandline
-COMMANDTITLE
 commctrl
 commdlg
 compmgmt
@@ -241,15 +246,14 @@ CONTEXTMENUHANDLER
 CONTROLL
 CONTROLPARENT
 copiedcolorrepresentation
+COREWINDOW
 cotaskmem
 COULDNOT
 countof
+cph
 CPower
 cppblog
-cppruntime
-cppstd
 cppwinrt
-CProj
 createdump
 CREATESCHEDULEDTASK
 CREATESTRUCT
@@ -265,6 +269,7 @@ CSettings
 cso
 CSRW
 CStyle
+cswinrt
 CSY
 CTest
 currentculture
@@ -316,6 +321,7 @@ Dedup
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
 DEFAULTCOLOR
 DEFAULTFLAGS
+DEFAULTICON
 DEFAULTONLY
 DEFAULTTONEAREST
 DEFAULTTONULL
@@ -330,6 +336,7 @@ deletethis
 DENORMAL
 depersist
 deprioritized
+DESELECTOTHERS
 DESKTOPABSOLUTEEDITING
 DESKTOPABSOLUTEPARSING
 desktopshorcutinstalled
@@ -360,6 +367,7 @@ dllmain
 DNLEN
 DONOTROUND
 DONTVALIDATEPATH
+DOPUS
 dotnet
 DPICHANGED
 DPIs
@@ -406,6 +414,7 @@ dxgi
 dxgidebug
 dxgiformat
 dxguid
+easeofaccess
 ecount
 EData
 Edid
@@ -425,11 +434,12 @@ encodedlaunch
 encryptor
 endpointvolume
 ENDSESSION
+ENSUREVISIBLE
 ENTERSIZEMOVE
 ENU
 EOAC
-epu
 EPO
+epu
 ERASEBKGND
 EREOF
 EResize
@@ -484,7 +494,6 @@ FILEFLAGSMASK
 FILELOCKSMITH
 FILELOCKSMITHCONTEXTMENU
 FILELOCKSMITHEXT
-FILELOCKSMITHLIB
 FILELOCKSMITHLIBINTEROP
 FILEMUSTEXIST
 FILEOP
@@ -500,12 +509,14 @@ findfast
 FIXEDFILEINFO
 flac
 flyouts
+FMask
 FOF
 FOFX
 FOLDERID
 folderpath
 FORCEMINIMIZE
 formatetc
+FORPARSING
 FRAMECHANGED
 frm
 Froml
@@ -521,7 +532,6 @@ GCLP
 gdi
 gdiplus
 GDISCALED
-gdnbaselines
 GEmoji
 GETCLIENTAREAANIMATION
 GETDESKWALLPAPER
@@ -541,7 +551,6 @@ gpedit
 gpo
 GPOCA
 gpp
-GPT
 gpu
 GSM
 gtm
@@ -562,6 +571,7 @@ Hashset
 hashtag
 HASHVAL
 HASSTRINGS
+HASSUBCOMMANDS
 hbitmap
 hbm
 hbmp
@@ -605,7 +615,6 @@ hmenu
 hmodule
 hmonitor
 homljgmgpmcbpjbnjpfijnhipfkiclkd
-HOOKPROC
 Hostbackdropbrush
 hotkeycontrol
 hotkeys
@@ -641,6 +650,7 @@ IBeam
 ICapture
 IClass
 ICONERROR
+ICONLOCATION
 IData
 IDD
 IDesktop
@@ -658,6 +668,7 @@ IFACEMETHOD
 IFACEMETHODIMP
 IFile
 IFilter
+IGNOREUNKNOWN
 IGraphics
 iid
 Iindex
@@ -701,7 +712,6 @@ INSTALLSTARTMENUSHORTCUT
 INSTALLSTATE
 Inste
 Intelli
-interactable
 Interlop
 INTRESOURCE
 INVALIDARG
@@ -720,6 +730,8 @@ ISettings
 IShell
 isocpp
 iss
+issecret
+ISSEPARATOR
 ITask
 ith
 ITHUMBNAIL
@@ -730,7 +742,6 @@ IWeb
 IWIC
 iwr
 IYUV
-JArray
 jfi
 jfif
 jgeosdfsdsgmkedfgdfgdfgbkmhcgcflmi
@@ -760,8 +771,8 @@ keyremaps
 keyvault
 KILLFOCUS
 killrunner
+kmph
 Knownfolders
-ksh
 KSPROPERTY
 Kybd
 languagesjson
@@ -797,7 +808,6 @@ LOADFROMFILE
 LOBYTE
 LOCALDISPLAY
 LOCALPACKAGE
-localport
 LOCALSYSTEM
 LOCATIONCHANGE
 LOGFONT
@@ -811,6 +821,7 @@ LOWORD
 lparam
 LPBITMAPINFOHEADER
 LPCITEMIDLIST
+lpcmi
 LPCMINVOKECOMMANDINFO
 LPCREATESTRUCT
 LPCRECT
@@ -835,9 +846,11 @@ lptpm
 LPTR
 LPTSTR
 LPW
+lpwcx
 lpwndpl
 LReader
 LRESULT
+LSTATUS
 lstrcmp
 lstrcmpi
 lstrlen
@@ -852,10 +865,10 @@ lwin
 LZero
 majortype
 makecab
-MAKELANGID
 MAKEINTRESOURCE
 MAKEINTRESOURCEA
 MAKEINTRESOURCEW
+MAKELANGID
 makepri
 manifestdependency
 MAPPEDTOSAMEKEY
@@ -875,7 +888,6 @@ mdwn
 MEDIASUBTYPE
 mediatype
 mef
-MENUBREAK
 MENUITEMINFO
 MENUITEMINFOW
 MERGECOPY
@@ -935,9 +947,9 @@ MRT
 mru
 mrw
 msc
-msclr
 mscorlib
 msdata
+MSDL
 msedge
 MSGFLT
 msiexec
@@ -996,6 +1008,8 @@ newdev
 NEWDIALOGSTYLE
 newitem
 newpath
+newplus
+NEWPLUSCONTEXTMENU
 newrow
 newsgroups
 NIF
@@ -1008,7 +1022,10 @@ NOAGGREGATION
 NOASYNC
 NOCLOSEPROCESS
 NOCOALESCE
+NOCOMM
+NOCONFIRMMKDIR
 NOCOPYBITS
+NOCOPYSECURITYATTRIBS
 nodeca
 nodoc
 NODRAWCAPTION
@@ -1016,6 +1033,7 @@ NODRAWICON
 NOINHERITLAYOUT
 NOINTERFACE
 NOLINKINFO
+NOMCX
 NOMINMAX
 NOMIRRORBITMAP
 NOMOVE
@@ -1038,6 +1056,7 @@ NOSEARCH
 NOSENDCHANGING
 NOSIZE
 NOTIFICATIONSDLL
+NOTIFYICONDATA
 NOTIFYICONDATAW
 NOTIMPL
 notlike
@@ -1074,7 +1093,6 @@ oldtheme
 oleaut
 OLECHAR
 onebranch
-OOBEPT
 opencode
 OPENFILENAME
 opensource
@@ -1098,7 +1116,6 @@ OVERLAPPEDWINDOW
 overlaywindow
 Oversampling
 OWNDC
-OWNERDRAW
 Packagemanager
 PACL
 PAINTSTRUCT
@@ -1112,11 +1129,11 @@ PARTIALCONFIRMATIONDIALOGTITLE
 PATCOPY
 pathcch
 PATHMUSTEXIST
-Pathto
 PATINVERT
 PATPAINT
 PAUDIO
 pbc
+pbi
 PBlob
 pcb
 pcch
@@ -1125,11 +1142,13 @@ pch
 pchast
 PCIDLIST
 PCWSTR
+pdbs
 pdisp
 pdo
 pdto
 pdtobj
 pdw
+Peb
 pef
 PElems
 Pels
@@ -1161,6 +1180,7 @@ ploca
 plocm
 pluginsmodel
 PMSIHANDLE
+pnid
 Pnp
 Popups
 POPUPWINDOW
@@ -1188,6 +1208,7 @@ ppv
 prc
 Prefixer
 Preinstalled
+prependpath
 prevhost
 previewer
 PREVIEWHANDLERFRAMEINFO
@@ -1212,6 +1233,8 @@ projectname
 PROPBAG
 PROPERTYKEY
 propkey
+propsys
+PROPVARIANT
 propvarutil
 prvpane
 psapi
@@ -1243,6 +1266,7 @@ PWSTR
 pwsz
 pwtd
 QDC
+QDir
 qianlifeng
 qit
 QITAB
@@ -1253,8 +1277,6 @@ QUERYENDSESSION
 QUERYOPEN
 QUEUESYNC
 QUNS
-qwertyuiopasdfghjklzxcvbnm
-qwrtyuiopsghjklzxvnm
 raf
 RAII
 RAlt
@@ -1271,7 +1293,6 @@ RECTDESTINATION
 rectp
 RECTSOURCE
 recyclebin
-redirectedfrom
 Redist
 redistributable
 reencode
@@ -1353,8 +1374,6 @@ runas
 rundll
 rungameid
 RUNLEVEL
-runsettings
-runspace
 runtimeclass
 runtimeobject
 runtimepack
@@ -1375,12 +1394,14 @@ SCID
 Scip
 scipbe
 Scode
+screensaver
 screenshots
 scrollviewer
 sddl
 SDKDDK
 sdns
 searchterm
+SEARCHUI
 secpol
 SENDCHANGE
 sendinput
@@ -1416,6 +1437,8 @@ SHELLEXECUTEINFO
 SHELLEXECUTEINFOW
 shellscalingapi
 SHFILEINFO
+SHFILEOPSTRUCT
+SHGDN
 SHGDNF
 SHGFI
 shinfo
@@ -1423,6 +1446,7 @@ shldisp
 shlobj
 shlwapi
 shmem
+SHNAMEMAPPING
 shobjidl
 SHORTCUTATLEAST
 shortcutcontrol
@@ -1512,7 +1536,6 @@ STATICEDGE
 STATSTG
 stdafx
 STDAPI
-stdcpp
 stdcpplatest
 STDMETHODCALLTYPE
 STDMETHODIMP
@@ -1528,7 +1551,7 @@ stringtable
 stringval
 Strm
 Strmiids
-Strret
+strret
 strsafe
 strutil
 sttngs
@@ -1536,7 +1559,7 @@ Stubless
 STYLECHANGED
 STYLECHANGING
 subkeys
-SUBLANG
+sublang
 subquery
 Superbar
 sut
@@ -1544,10 +1567,13 @@ svchost
 SVGIn
 SVGIO
 svgz
+SVSI
 SWC
 SWFO
 SWP
 SWRESTORE
+symbolrequestprod
+SYMCACHE
 SYMED
 SYMOPT
 SYNCMFT
@@ -1564,7 +1590,9 @@ SYSKEYUP
 SYSLIB
 SYSMENU
 SYSTEMAPPS
+systemsettings
 SYSTEMTIME
+SYSTEMWOW
 tapp
 TApplication
 TApplied
@@ -1587,7 +1615,6 @@ TDevice
 telem
 telephon
 templatenamespace
-testhost
 testprocess
 TEXCOORD
 TEXTEXTRACTOR
@@ -1612,16 +1639,17 @@ tlb
 tlbimp
 TMPVAR
 TNP
-toggleswitch
 Toolhelp
 toolkitconverters
 Toolset
 toolwindow
 TOPDOWNDIB
+TOTALCMD
 TOUCHEVENTF
 TOUCHINPUT
 touchpad
 tracelogging
+trafficmanager
 traies
 transicc
 TRAYMOUSEMESSAGE
@@ -1642,9 +1670,11 @@ TYPESHORTCUT
 UAC
 UAL
 uap
+UCallback
 udit
 uefi
 uesc
+UFlags
 UHash
 UIA
 UIEx
@@ -1676,12 +1706,15 @@ urlmon
 Usb
 USEDEFAULT
 USEFILEATTRIBUTES
+USEPOSITION
 USERDATA
 Userenv
 USESHOWWINDOW
+USESIZE
 USESTDHANDLES
 USRDLL
 UType
+uuidv
 uwp
 uxtheme
 vabdq
@@ -1715,8 +1748,10 @@ VIDEOINFOHEADER
 viewmodel
 vih
 VIRTUALDESK
+VISEGRADRELAY
 visiblecolorformats
 Visibletrue
+visualeffects
 VKey
 vmovl
 vorrq
@@ -1741,8 +1776,10 @@ VSTHRD
 VSTT
 vswhere
 Vtbl
+WANTMAPPINGHANDLE
 WANTPALM
 wbem
+Wbemidl
 wbemuuid
 WBounds
 Wca
@@ -1751,6 +1788,7 @@ WCE
 wcex
 WClass
 wcsicmp
+wcsncpy
 wcsnicmp
 WDA
 wdp
@@ -1830,6 +1868,10 @@ WNDCLASSEXW
 WNDCLASSW
 WNDPROC
 workarounds
+WORKSPACESEDITOR
+WORKSPACESLAUNCHER
+WORKSPACESSNAPSHOTTOOL
+WORKSPACESWINDOWARRANGER
 wox
 wparam
 wpf
@@ -1869,6 +1911,7 @@ XLoc
 XNamespace
 XPels
 XPixel
+xplorer
 XResource
 xsi
 XStr

.github/policies/resourceManagement.yml

@@ -236,11 +236,22 @@ configuration:
     - if:
       - payloadType: Issue_Comment
       - commentContains:
-          pattern: 'I would [like|love] [to help|helping|to contribute|contributing|to implement|implementing|to fix|fixing]'
+          pattern: "I(( would|'d) (like|love|be happy)| want) (to help|helping|to contribute|contributing|to implement|implementing|to fix|fixing)"
           isRegex: True
       then:
       - addReply:
           reply: Hi! Your last comment indicates to our system, that you might want to contribute to this feature/fix this bug. Thank you! Please make us aware on our ["Would you like to contribute to PowerToys?" thread](https://github.com/microsoft/PowerToys/issues/28769), as we don't see all the comments. <br /><br />_I'm a bot (beep!) so please excuse any mistakes I may make_
+      description:
+    - if:
+      - payloadType: Issues
+      - isAction:
+          action: Opened
+      - bodyContains:
+          pattern: 'Area\(s\) with issue\?\s*\nWorkspaces'
+          isRegex: True
+      then:
+      - addLabel:
+          label: Product-Workspaces
       description: 
 onFailure: 
 onSuccess: 

.github/workflows/package-submissions.yml

@@ -24,7 +24,7 @@ jobs:
           $installerMachineX64Url = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'PowerToysSetup.*x64' | Select -ExpandProperty browser_download_url
           $installerUserArmUrl = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'PowerToysUserSetup.*arm64' | Select -ExpandProperty browser_download_url
           $installerMachineArmUrl = $targetRelease | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match 'PowerToysSetup.*arm64' | Select -ExpandProperty browser_download_url
-          $ver = $targetRelease.tag_name.Trim("v")
+          $ver = $targetRelease.tag_name -ireplace '^v'
 
           # getting latest wingetcreate file
           iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe

.github/workflows/similarIssues.yml

@@ -1,33 +0,0 @@
-name: GitGudSimilarIssues comments
-
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  getSimilarIssues:
-    runs-on: ubuntu-latest
-    outputs:
-      message: ${{ steps.getBody.outputs.message }}
-    steps:
-      - id: getBody
-        uses: craigloewen-msft/GitGudSimilarIssues@main
-        with:
-          issueTitle: ${{ github.event.issue.title }}
-          issueBody: ${{ github.event.issue.body }}
-          repo: ${{ github.repository }}
-          similarityTolerance: "0.75"
-  add-comment:
-    needs: getSimilarIssues
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    if: needs.getSimilarIssues.outputs.message != ''
-    steps:
-      - name: Add comment
-        run: gh issue comment "$NUMBER" --repo "$REPO" --body "$BODY"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NUMBER: ${{ github.event.issue.number }}
-          REPO: ${{ github.repository }}
-          BODY: ${{ needs.getSimilarIssues.outputs.message }}

.pipelines/ESRPSigning_core.json

@@ -178,6 +178,9 @@
                 "PowerToys.MouseWithoutBordersHelper.dll",
                 "PowerToys.MouseWithoutBordersHelper.exe",
 
+                "WinUI3Apps\\PowerToys.NewPlus.ShellExtension.dll",
+                "WinUI3Apps\\NewPlusPackage.msix",
+
                 "PowerAccent.Core.dll",
                 "PowerToys.PowerAccent.dll",
                 "PowerToys.PowerAccent.exe",
@@ -189,6 +192,15 @@
                 "WinUI3Apps\\PowerToys.PowerRenameContextMenu.dll",
                 "WinUI3Apps\\PowerRenameContextMenuPackage.msix",
 
+                "PowerToys.WorkspacesSnapshotTool.exe",
+                "PowerToys.WorkspacesLauncher.exe",
+                "PowerToys.WorkspacesWindowArranger.exe",
+                "PowerToys.WorkspacesEditor.exe",
+                "PowerToys.WorkspacesEditor.dll",
+                "PowerToys.WorkspacesLauncherUI.exe",
+                "PowerToys.WorkspacesLauncherUI.dll",
+                "PowerToys.WorkspacesModuleInterface.dll",
+
                 "WinUI3Apps\\PowerToys.RegistryPreviewExt.dll",
                 "WinUI3Apps\\PowerToys.RegistryPreviewUILib.dll",
                 "WinUI3Apps\\PowerToys.RegistryPreview.dll",

.pipelines/ci/caching.yml

@@ -1,41 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/main/service-schema.json
-trigger:
-  batch: true
-  branches:
-    include:
-      - main
-      - stable
-  paths:
-    exclude:
-      - doc/*
-      - temp/*
-      - tools/*
-      - '**.md'
-
-pr:
-  branches:
-    include:
-      - main
-      - stable
-  paths:
-    exclude:
-      - '**.md'
-      - doc
-       
-#     0.0.yyMM.dd##
-#     0.0.1904.0900
-name: 0.0.$(Date:yyMM).$(Date:dd)$(Rev:rr)
-
-variables:
-  EnablePipelineCache: true
-
-jobs:
-  - template: ./templates/build-powertoys-precheck.yml
-  - template: ./templates/build-powertoys-ci.yml
-    parameters:
-      platform: x64
-      enableCaching: true
-  - template: ./templates/build-powertoys-ci.yml
-    parameters:
-      platform: arm64
-      enableCaching: true

.pipelines/ci/ci.yml

@@ -1,46 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/main/service-schema.json
-trigger:
-  batch: true
-  branches:
-    include:
-      - main
-      - stable
-  paths:
-    exclude:
-      - doc/*
-      - temp/*
-      - tools/*
-      - '**.md'
-
-pr:
-  branches:
-    include:
-      - main
-      - stable
-  paths:
-    exclude:
-      - '**.md'
-      - doc
-       
-#     0.0.yyMM.dd##
-#     0.0.1904.0900
-name: 0.0.$(Date:yyMM).$(Date:dd)$(Rev:rr)
-
-variables:
-  EnablePipelineCache: true
-
-jobs:
-  - template: ./templates/build-powertoys-precheck.yml
-  - template: ./templates/build-powertoys-ci.yml
-    parameters:
-      platform: x64
-      ${{ if eq(variables['System.PullRequest.IsFork'], 'False') }}:
-        enableCaching: true
-  - template: ./templates/build-powertoys-ci.yml
-    parameters:
-      platform: arm64
-      ${{ if eq(variables['System.PullRequest.IsFork'], 'False') }}:
-        enableCaching: true
-#  - template: ./templates/run-ui-tests-ci.yml
-#    parameters:
-#      platform: x64 

.pipelines/ci/templates/build-powertoys-ci.yml

@@ -1,44 +0,0 @@
-parameters:
-  - name: configuration
-    type: string
-    default: 'Release'
-  - name: platform
-    type: string
-    default: 'x64'
-  - name: additionalBuildArguments
-    type: string
-    default: '-p:RestorePackagesConfig=true -m'
-  - name: enableCaching
-    type: boolean
-    default: false
-
-jobs:
-- job: Build${{ parameters.platform }}${{ parameters.configuration }}
-  displayName: Build ${{ parameters.platform }} ${{ parameters.configuration }}
-  dependsOn: Precheck
-  condition: and(succeeded(),ne(dependencies.Precheck.outputs['verifyBuildRequest.skipBuild'], 'Yes'))
-  variables:
-    BuildConfiguration: ${{ parameters.configuration }}
-    BuildPlatform: ${{ parameters.platform }}
-    NUGET_RESTORE_MSBUILD_ARGS: /p:Platform=${{ parameters.platform }} # Required for nuget to work due to self contained
-    NODE_OPTIONS: --max_old_space_size=16384
-  pool:
-    demands: ImageOverride -equals SHINE-VS17-Latest
-    ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-      name: SHINE-INT-L
-    ${{ else }}:
-      name: SHINE-OSS-L
-  timeoutInMinutes: 120
-  strategy:
-    maxParallel: 10
-  steps:
-  - template: build-powertoys-steps.yml
-    parameters:
-      additionalBuildArguments: ${{ parameters.additionalBuildArguments }}
-      enableCaching: ${{ parameters.enableCaching }}
-
-  # It appears that the Component Governance build task that gets automatically injected stopped working
-  # when we renamed our main branch.
-  - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-    displayName: 'Component Detection'
-    condition: and(succeededOrFailed(), not(eq(variables['Build.Reason'], 'PullRequest')))

.pipelines/ci/templates/build-powertoys-installer.yml

@@ -1,20 +0,0 @@
-parameters:
-  configuration: 'Release'
-  platform: ''
-  additionalBuildArguments: '/p:RestorePackagesConfig=true -m'
-
-jobs:
-- job: Build${{ parameters.platform }}${{ parameters.configuration }}
-  displayName: Build ${{ parameters.platform }} ${{ parameters.configuration }}
-  variables:
-    BuildConfiguration: ${{ parameters.configuration }}
-    BuildPlatform: ${{ parameters.platform }}
-  pool:
-      name: SHINE-INT-L
-  timeoutInMinutes: 120
-  strategy:
-    maxParallel: 10
-  steps:
-  - template: build-powertoys-steps.yml
-    parameters:
-      additionalBuildArguments: ${{ parameters.additionalBuildArguments }}

.pipelines/ci/templates/build-powertoys-precheck.yml

@@ -1,38 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/master/service-schema.json
-jobs:
-- job: Precheck
-  pool:
-    demands: ImageOverride -equals SHINE-VS17-Latest
-    ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-      name: SHINE-INT-L
-    ${{ else }}:
-      name: SHINE-OSS-L
-  steps:
-  - checkout: none
-
-  - task: PowerShell@2
-    displayName: Verify Build Request
-    inputs:
-      targetType: 'inline'
-      script: |
-        try {
-          # Try based on pull request first
-          $pullRequestNumber = "$(system.pullRequest.pullRequestNumber)";
-          $gitHubPullRequest = Invoke-RestMethod -Method Get "https://api.github.com/repos/microsoft/PowerToys/pulls/$pullRequestNumber/files"
-          # If there are no files updated in the commit that are .md, set skipBuild variable
-          if(([array]($gitHubPullRequest.filename) -notmatch ".md|.txt").Length -eq 0) {
-              Write-Host '##vso[task.setvariable variable=skipBuild;isOutput=true]Yes'
-              Write-Host 'Skipping Build'
-          }
-        }
-        catch {
-          # Fall back to the latest commit otherwise.
-          $commit = "$(build.sourceVersion)";
-          $gitHubCommit = Invoke-RestMethod -Method Get "https://api.github.com/repos/microsoft/PowerToys/commits/$commit"
-          if(([array]($githubCommit.files.filename) -notmatch ".md|.txt").Length -eq 0) {
-            Write-Host '##vso[task.setvariable variable=skipBuild;isOutput=true]Yes'
-            Write-Host 'Skipping Build'
-          }
-        }
-      pwsh: true
-    name: verifyBuildRequest

.pipelines/ci/templates/build-powertoys-steps.yml

@@ -1,297 +0,0 @@
-parameters:
-  - name: additionalBuildArguments
-    type: string
-    default: ''
-  - name: enableCaching
-    type: boolean
-    default: false
-
-steps:
-- checkout: self
-  fetchDepth: 1
-  submodules: true
-  clean: true
-
-- task: UseDotNet@2
-  displayName: 'Use .NET 6 SDK'
-  inputs:
-    packageType: sdk
-    version: '6.x'
-
-- task: PowerShell@2
-  displayName: Verify XAML formatting
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\applyXamlStyling.ps1'
-    arguments: -Passive
-    pwsh: true
-
-- task: PowerShell@2
-  displayName: Verify Nuget package versions for PowerToys.sln
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyNugetPackages.ps1'
-    arguments: -solution '$(build.sourcesdirectory)\PowerToys.sln'
-    pwsh: true
-
-- task: PowerShell@2
-  displayName: Verify Arm64 configuration for PowerToys.sln
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyArm64Configuration.ps1'
-    arguments: -solution '$(build.sourcesdirectory)\PowerToys.sln'
-    pwsh: true
-
-- task: PowerShell@2
-  displayName: Verify Arm64 configuration for BugReportTool.sln
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyArm64Configuration.ps1'
-    arguments: -solution '$(build.sourcesdirectory)\tools\BugReportTool\BugReportTool.sln'
-    pwsh: true
-
-- task: PowerShell@2
-  displayName: Verify Arm64 configuration for WebcamReportTool.sln
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyArm64Configuration.ps1'
-    arguments: -solution '$(build.sourcesdirectory)\tools\WebcamReportTool\WebcamReportTool.sln'
-    pwsh: true
-
-- task: PowerShell@2
-  displayName: Verify Arm64 configuration for StylesReportTool.sln
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyArm64Configuration.ps1'
-    arguments: -solution '$(build.sourcesdirectory)\tools\StylesReportTool\StylesReportTool.sln'
-    pwsh: true
-
-- task: PowerShell@2
-  displayName: Verify Arm64 configuration for PowerToysSetup.sln
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyArm64Configuration.ps1'
-    arguments: -solution '$(build.sourcesdirectory)\installer\PowerToysSetup.sln'
-    pwsh: true
-
-- task: PowerShell@2
-  displayName: Verify and set latest VCToolsVersion usage
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyAndSetLatestVCToolsVersion.ps1'
-    pwsh: true
-
-- task: UseDotNet@2
-  displayName: 'Use .NET 8 SDK'
-  inputs:
-    packageType: sdk
-    version: '8.x'
-    includePreviewVersions: true
-
-- task: VisualStudioTestPlatformInstaller@1
-  displayName: Ensure VSTest Platform
-
-- task: Cache@2
-  displayName: 'Cache nuget packages (PackageReference)'
-  inputs:
-    key: '"PackageReference" | "$(Agent.OS)" | Directory.Packages.props'
-    restoreKeys: |
-       "PackageReference" | "$(Agent.OS)"
-       "PackageReference"
-    path: $(NUGET_PACKAGES)
-
-- task: Cache@2
-  displayName: 'Cache nuget packages (packages.config)'
-  inputs:
-    key: '"packages.config" | "$(Agent.OS)" | **/packages.config'
-    restoreKeys: |
-       "packages.config" | "$(Agent.OS)"
-       "packages.config"
-    path: packages
-
-- ${{ if eq(parameters.enableCaching, true) }}:
-  - task: NuGetToolInstaller@1
-    displayName: Install NuGet
-
-  - script: nuget restore packages.config -SolutionDirectory .
-    displayName: 'nuget restore packages.config'
-
-- task: VSBuild@1
-  displayName: 'Build and Test PowerToys.sln'
-  inputs:
-    solution: '**\PowerToys.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    ${{ if eq(parameters.enableCaching, true) }}:
-      msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -t:Build;Test -graph -reportfileaccesses -p:MSBuildCacheEnabled=true -p:MSBuildCacheLogDirectory=$(Build.ArtifactStagingDirectory)\logs\MSBuildCache -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToys.binlog -ds:false
-    ${{ else }}:
-      msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -t:Build;Test -graph -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToys.binlog -ds:false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-  ${{ if eq(parameters.enableCaching, true) }}:
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-
-- task: VSBuild@1
-  displayName: 'Build BugReportTool.sln'
-  inputs:
-    solution: '**\BugReportTool.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -graph -bl:$(Build.ArtifactStagingDirectory)\logs\BugReportTool.binlog -ds:false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-
-- task: VSBuild@1
-  displayName: 'Build WebcamReportTool.sln'
-  inputs:
-    solution: '**\WebcamReportTool.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -graph -bl:$(Build.ArtifactStagingDirectory)\logs\WebcamReportTool.binlog -ds:false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-
-- task: VSBuild@1
-  displayName: 'Build StylesReportTool.sln'
-  inputs:
-    solution: '**\StylesReportTool.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: -restore ${{ parameters.additionalBuildArguments }} -graph -bl:$(Build.ArtifactStagingDirectory)\logs\StylesReportTool.binlog -ds:false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-
-- task: PowerShell@2
-  displayName: Download and install WiX 3.14 development build
-  inputs:
-    targetType: filePath
-    filePath: '$(build.sourcesdirectory)\.pipelines\installWiX.ps1'
-
-- task: VSBuild@1
-  displayName: 'Build PowerToys per-machine MSI'
-  inputs:
-    solution: '**\installer\PowerToysSetup.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: /t:PowerToysInstaller -restore ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysInstaller.binlog -ds:false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-
-- task: VSBuild@1
-  displayName: 'Build PowerToys per-machine Bootstrapper'
-  inputs:
-    solution: '**\installer\PowerToysSetup.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: /t:PowerToysBootstrapper ${{ parameters.additionalBuildArguments }} -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysBootstrapper.binlog -ds:false
-    clean: false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-
-- task: PowerShell@2
-  displayName: Clean installer dir before building per-user installer
-  inputs:
-    targetType: inline
-    script: git clean -xfd  -e *exe -- .\installer\
-    pwsh: true
-
-- task: VSBuild@1
-  displayName: 'Build PowerToys per-user MSI'
-  inputs:
-    solution: '**\installer\PowerToysSetup.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: /t:PowerToysInstaller -restore ${{ parameters.additionalBuildArguments }} /p:PerUser=true -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysInstaller-PerUser.binlog -ds:false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-
-- task: VSBuild@1
-  displayName: 'Build PowerToys per-user Bootstrapper'
-  inputs:
-    solution: '**\installer\PowerToysSetup.sln'
-    vsVersion: 17.0
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    msbuildArgs: /t:PowerToysBootstrapper ${{ parameters.additionalBuildArguments }} /p:PerUser=true -bl:$(Build.ArtifactStagingDirectory)\logs\PowerToysSetup-PowerToysBootstrapper-PerUser.binlog -ds:false
-    clean: false
-    msbuildArchitecture: x64
-    maximumCpuCount: true
-
-# Check if deps.json files don't reference different dll versions.
-- task: PowerShell@2
-  displayName: Audit deps.json files for all applications
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyDepsJsonLibraryVersions.ps1'
-    arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
-    pwsh: true
-
-# Check if asset files on the main application paths are playing nice and avoiding basic conflicts.
-- task: PowerShell@2
-  displayName: Audit base applications path asset conflicts
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyPossibleAssetConflicts.ps1'
-    arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
-    pwsh: true
-
-- task: PowerShell@2
-  displayName: Audit WinAppSDK applications path asset conflicts
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyPossibleAssetConflicts.ps1'
-    arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)\WinUI3Apps'
-    pwsh: true
-
-# Publish test results which ran in MSBuild
-- task: PublishTestResults@2
-  displayName: 'Publish Test Results'
-  inputs:
-    testResultsFormat: VSTest
-    testResultsFiles: '**/*.trx'
-  condition: always()
-
-# Native dlls
-- task: VSTest@2
-  condition: ne(variables['BuildPlatform'],'arm64') # No arm64 agents to run the tests.
-  displayName: 'Native Tests'
-  inputs:
-    platform: '$(BuildPlatform)'
-    configuration: '$(BuildConfiguration)'
-    testSelector: 'testAssemblies'
-    testAssemblyVer2: |
-      **\KeyboardManagerEngineTest.dll
-      **\KeyboardManagerEditorTest.dll
-      **\UnitTests-CommonLib.dll
-      **\PowerRenameUnitTests.dll
-      **\UnitTests-FancyZones.dll
-      !**\obj\**
-
-- task: PowerShell@2
-  displayName: Trigger dotnet welcome message so that it does not cause errors on other scripts
-  inputs:
-    targetType: 'inline'
-    script: |
-      dotnet list $(build.sourcesdirectory)\src\common\Common.UI\Common.UI.csproj package
-
-- task: PowerShell@2
-  displayName: Verify Notice.md and Nuget packages match
-  inputs:
-    filePath: '$(build.sourcesdirectory)\.pipelines\verifyNoticeMdAgainstNugetPackages.ps1'
-    arguments: -path '$(build.sourcesdirectory)\'
-    pwsh: true
-
-- publish: $(Build.ArtifactStagingDirectory)\logs
-  displayName: Publish Logs
-  artifact: '$(System.JobDisplayName) logs'
-  condition: always()
-
-- task: CopyFiles@2
-  displayName: Copy Build Files
-  condition: and(succeeded(), ne(variables['BuildPlatform'],'arm64')) 
-  inputs:
-    sourceFolder: '$(Build.SourcesDirectory)'
-    contents: '$(BuildPlatform)/$(BuildConfiguration)/**/*'
-    targetFolder: '$(Build.ArtifactStagingDirectory)\$(BuildPlatform)\$(BuildConfiguration)'
-
-- publish: $(Build.ArtifactStagingDirectory)\$(BuildPlatform)\$(BuildConfiguration)
-  displayName: Publish Build Artifacts
-  artifact: build-$(BuildPlatform)-$(BuildConfiguration)
-  condition: and(succeeded(), ne(variables['BuildPlatform'],'arm64')) 

.pipelines/ci/templates/run-ui-tests-ci.yml

@@ -1,70 +0,0 @@
-parameters:
-  configuration: 'Release'
-  platform: ''
-  
-jobs:
-- job: UITest
-  displayName: UI Test ${{ parameters.platform }} ${{ parameters.configuration }}
-  dependsOn: Build${{ parameters.platform }}${{ parameters.configuration }}
-  variables:
-    SrcPath: $(Build.Repository.LocalPath)
-  pool:
-    ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-      name: SHINE-INT-Testing-x64
-    ${{ else }}:
-      name: SHINE-OSS-Testing-x64
-  steps:
-  - checkout: self
-    fetchDepth: 1
-    submodules: false
-    clean: true
-    fetchTags: false
-
-  - download: current
-    displayName: Download artifacts
-    artifact: build-${{ parameters.platform }}-${{ parameters.configuration }}
-
-  - task: UseDotNet@2
-    displayName: 'Use .NET 6 SDK'
-    inputs:
-      packageType: sdk
-      version: '6.x'
-
-  - task: UseDotNet@2
-    displayName: 'Use .NET 8 SDK'
-    inputs:
-      packageType: sdk
-      version: '8.x'
-      includePreviewVersions: true
-
-  - task: VisualStudioTestPlatformInstaller@1
-    displayName: Ensure VSTest Platform
-
-  - task: PowerShell@2
-    displayName: Download and install WinAppDriver
-    inputs:
-      targetType: filePath
-      filePath: '$(build.sourcesdirectory)\.pipelines\InstallWinAppDriver.ps1'
-      
-  - task: ScreenResolutionUtility@1
-    inputs:
-      displaySettings: 'optimal'
-    
-  - task: VSTest@2
-    displayName: 'UI Tests'
-    condition: and(succeeded(), ne(variables['BuildPlatform'],'arm64')) # No arm64 agents to run the tests.
-    inputs:
-      platform: '$(BuildPlatform)'
-      configuration: '$(BuildConfiguration)'
-      testSelector: 'testAssemblies'
-      searchFolder: '$(Pipeline.Workspace)\build-${{ parameters.platform }}-${{ parameters.configuration }}'
-      vstestLocationMethod: 'location' # otherwise fails to find vstest.console.exe 
-      #vstestLocation: '$(Agent.ToolsDirectory)\VsTest\**\${{ parameters.platform }}\tools\net462\Common7\IDE\Extensions\TestPlatform'
-      vstestLocation: '$(Agent.ToolsDirectory)\VsTest\17.10.0\x64\tools\net462\Common7\IDE\Extensions\TestPlatform'
-      uiTests: true
-      rerunFailedTests: true
-      testAssemblyVer2: |
-        **\UITests-FancyZones.dll
-        **\UITests-FancyZonesEditor.dll
-        !**\obj\**
-        !**\ref\**

.pipelines/installer-steps.yml

@@ -1,152 +0,0 @@
-parameters:
-  - name: versionNumber
-    type: string
-    default: "0.0.1"
-  - name: perUserArg
-    type: string
-    default: "false"
-  - name: buildSubDir
-    type: string
-    default: "MachineSetup"
-  - name: installerPrefix
-    type: string
-    default: "PowerToysSetup"
-  - name: signingParameters
-    type: object
-    default: {}
-
-steps:
-  - task: VSBuild@1
-    displayName: Build PowerToysSetupCustomActions DLL # This dll needs to be build and signed before building the MSI.
-    inputs:
-      solution: "**/installer/PowerToysSetup.sln"
-      vsVersion: 17.0
-      msbuildArgs: -restore /p:RestorePackagesConfig=true /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog /t:PowerToysSetupCustomActions /p:RunBuildEvents=true /p:PerUser=${{parameters.perUserArg}}
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: true
-      maximumCpuCount: true
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-    displayName: Sign PowerToysSetupCustomActions DLL
-    inputs:
-      ${{ insert }}: ${{ parameters.signingParameters }}
-      FolderPath: 'installer/PowerToysSetupCustomActions/$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}'
-      signType: batchSigning
-      batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-      ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-  ## INSTALLER START
-  #### MSI BUILDING AND SIGNING
-  - task: VSBuild@1
-    displayName: Build MSI
-    inputs:
-      solution: "**/installer/PowerToysSetup.sln"
-      vsVersion: 17.0
-      msbuildArgs: /p:CIBuild=true /p:BuildProjectReferences=false /target:PowerToysInstaller /bl:$(Build.SourcesDirectory)\msbuild.binlog /p:RunBuildEvents=false /p:PerUser=${{parameters.perUserArg}}
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: false # don't undo our hard work above by deleting the CustomActions dll
-      maximumCpuCount: true
-
-  - task: CmdLine@2
-    displayName: "Extracting MSI to verify contents"
-    inputs:
-      script: |
-        "C:\Program Files (x86)\WiX Toolset v3.14\bin\dark.exe" -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).msi
-        dir $(build.sourcesdirectory)\extractedMsi
-
-  # Check if deps.json files don't reference different dll versions.
-  - task: PowerShell@2
-    displayName: Audit deps.json in MSI extracted files
-    inputs:
-      filePath: '.pipelines/verifyDepsJsonLibraryVersions.ps1'
-      arguments: -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
-      pwsh: true
-
-  # Did we sign all files
-  - task: PowerShell@1
-    displayName: Verifying entire build is signed and version set
-    inputs:
-      scriptName: .pipelines/versionAndSignCheck.ps1
-      arguments: -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
-
-  - task: PowerShell@1
-    displayName: Verifying MSI Custom Actions DLL is signed
-    inputs:
-      scriptName: .pipelines/versionAndSignCheck.ps1
-      arguments: -targetDir '$(build.sourcesdirectory)\extractedMsi\Binary'
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-    displayName: Sign MSI
-    inputs:
-      ${{ insert }}: ${{ parameters.signingParameters }}
-      FolderPath: 'installer/PowerToysSetup/$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}'
-      signType: batchSigning
-      batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-      ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-  #### END MSI
-  #### BOOTSTRAP BUILDING AND SIGNING
-
-  - task: VSBuild@1
-    displayName: Build Bootstrapper
-    inputs:
-      solution: "**/installer/PowerToysSetup.sln"
-      vsVersion: 17.0
-      msbuildArgs: /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog /t:PowerToysBootstrapper /p:PerUser=${{parameters.perUserArg}}
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: false # don't undo our hard work above by deleting the MSI
-      maximumCpuCount: true
-
-  - task: CmdLine@2
-    displayName: "Insignia: Extract Engine from Bundle"
-    inputs:
-      script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ib installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\engine.exe'
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-    displayName: "ESRP CodeSigning (Engine)"
-    inputs:
-      ${{ insert }}: ${{ parameters.signingParameters }}
-      FolderPath: "installer"
-      Pattern: engine.exe
-      signConfigType: inlineSignParams
-      inlineOperation: |
-        [
-            {
-                "KeyCode": "CP-230012",
-                "OperationCode": "SigntoolSign",
-                "Parameters": {
-                    "OpusName": "Microsoft",
-                    "OpusInfo": "http://www.microsoft.com",
-                    "FileDigest": "/fd \"SHA256\"",
-                    "PageHash": "/NPH",
-                    "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                },
-                "ToolName": "sign",
-                "ToolVersion": "1.0"
-            },
-            {
-                "KeyCode": "CP-230012",
-                "OperationCode": "SigntoolVerify",
-                "Parameters": {},
-                "ToolName": "sign",
-                "ToolVersion": "1.0"
-            }
-        ]
-
-  - task: CmdLine@2
-    displayName: "Insignia: Merge Engine into Bundle"
-    inputs:
-      script: '"C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ab installer\engine.exe installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).exe -o installer\PowerToysSetup\$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}\${{parameters.installerPrefix}}-${{ parameters.versionNumber }}-$(BuildPlatform).exe'
-
-  - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-    displayName: Sign Bootstrapper
-    inputs:
-      ${{ insert }}: ${{ parameters.signingParameters }}
-      FolderPath: 'installer/PowerToysSetup/$(BuildPlatform)\$(BuildConfiguration)\${{parameters.buildSubDir}}'
-      signType: batchSigning
-      batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-      ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-  #### END BOOTSTRAP
-  ## END INSTALLER

.pipelines/release.yml

@@ -1,551 +0,0 @@
-# This build should never run as CI or against a pull request.
-name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
-trigger: none
-pr: none
-
-resources:
-  repositories:
-  - repository: 1ESPipelineTemplates
-    type: git
-    name: 1ESPipelineTemplates/1ESPipelineTemplates
-    ref: refs/tags/release
-
-parameters:
-  - name: buildConfigurations
-    type: object
-    default:
-      - Release
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - arm64
-  - name: versionNumber
-    type: string
-    default: '0.0.1'
-  - name: signingParameters
-    type: object
-    default:
-      ConnectedServiceName: $(SigningServiceName)
-      AppRegistrationClientId: $(SigningAppId)
-      AppRegistrationTenantId: $(SigningTenantId)
-      AuthAKVName: $(SigningAKVName)
-      AuthCertName: $(SigningAuthCertName)
-      AuthSignCertName: $(SigningSignCertName)
-
-extends:
-  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
-  parameters:
-    customBuildTags:
-    - 1ES.PT.ViaStartRight
-    pool:
-      name: SHINE-INT-S
-      image: SHINE-VS17-Latest
-      os: windows
-    sdl:
-      tsa:
-        enabled: true
-        configFile: '$(Build.SourcesDirectory)\.pipelines\tsa.json'
-
-    stages:
-    - stage: build
-      displayName: Build (Complete)
-      pool:
-        name: SHINE-INT-L
-        image: SHINE-VS17-Latest
-        os: windows
-      jobs:
-      - job: Build
-        strategy:
-          matrix:
-            ${{ each config in parameters.buildConfigurations }}:
-              ${{ each platform in parameters.buildPlatforms }}:
-                ${{ config }}_${{ platform }}:
-                  BuildConfiguration: ${{ config }}
-                  BuildPlatform: ${{ platform }}
-        templateContext:
-          outputs:
-          - output: pipelineArtifact
-            artifactName: setup-$(BuildPlatform)
-            targetPath: $(Build.ArtifactStagingDirectory)
-        displayName: Build
-        timeoutInMinutes: 240 # Some of the 1ES Pipeline stuff and Loc take a very long time
-        cancelTimeoutInMinutes: 1
-        variables:
-          NUGET_RESTORE_MSBUILD_ARGS: /p:Platform=$(BuildPlatform) # Required for nuget to work due to self contained
-          NODE_OPTIONS: --max_old_space_size=16384
-          IsPipeline: 1 # The installer uses this to detect whether it should pick up localizations
-          SkipCppCodeAnalysis: 1 # Skip the code analysis to speed up release CI. It runs on PR CI, anyway
-          # IsExperimentationLive: 1 # The build and installer use this to turn on experimentation
-        steps:
-        - checkout: self
-          clean: true
-          submodules: true
-          persistCredentials: True
-
-      # Sets versions for all PowerToy created DLLs
-        - task: PowerShell@1
-          displayName: Set Versions.Prop
-          inputs:
-            scriptName: .pipelines/versionSetting.ps1
-            arguments: -versionNumber '${{ parameters.versionNumber }}' -DevEnvironment ''
-
-      # ESRP needs 'Microsoft.NETCore.App', version '6.0.0' (x64)
-        - task: UseDotNet@2
-          displayName: 'Use .NET 6 SDK'
-          inputs:
-            packageType: sdk
-            version: '6.x'
-
-        - task: UseDotNet@2
-          displayName: 'Use .NET 8 SDK'
-          inputs:
-            packageType: sdk
-            version: '8.x'
-
-        - task: PowerShell@2
-          displayName: Verify and set latest VCToolsVersion usage
-          inputs:
-            filePath: '$(build.sourcesdirectory)\.pipelines\verifyAndSetLatestVCToolsVersion.ps1'
-            pwsh: true
-
-        - task: NuGetAuthenticate@1
-            
-        - task: NuGetToolInstaller@1
-          displayName: Use NuGet Installer latest
-
-      # this will restore the following nugets:
-      # - main solution
-      # - Bug report tool
-      # - Webcam report tool
-      # - Installer
-      # - Bootstrapper Installer
-        - task: PowerShell@2
-          displayName: Download and install WiX 3.14 development build
-          inputs:
-            targetType: filePath
-            filePath: '$(build.sourcesdirectory)\.pipelines\installWiX.ps1'
-
-        - task: MicrosoftTDBuild.tdbuild-task.tdbuild-task.TouchdownBuildTask@3
-          displayName: 'Download Localization Files -- PowerToys 37400'
-          inputs:
-            teamId: 37400
-            TDBuildServiceConnection: $(TouchdownServiceConnection)
-            authType: SubjectNameIssuer
-            resourceFilePath: |
-             **\Resources.resx
-             **\Resource.resx
-             **\Resources.resw
-            appendRelativeDir: true
-            localizationTarget: false
-            # pseudoSetting: Included
-
-        - task: PowerShell@2
-          displayName: Move Loc files into correct locations
-          inputs:
-            targetType: inline
-            script: >-
-              $VerbosePreference = "Continue"
-
-              ./tools/build/move-and-rename-resx.ps1
-
-              ./tools/build/move-uwp-resw.ps1
-            pwsh: true
-            
-        - task: CmdLine@2
-          displayName: Moving telem files
-          inputs:
-            script: |
-              call nuget.exe restore -configFile .pipelines/release-nuget.config -PackagesDirectory . .pipelines/packages.config || exit /b 1
-              move /Y "Microsoft.PowerToys.Telemetry.2.0.0\build\include\TraceLoggingDefines.h" "src\common\Telemetry\TraceLoggingDefines.h" || exit /b 1
-              move /Y "Microsoft.PowerToys.Telemetry.2.0.0\build\include\TelemetryBase.cs" "src\common\Telemetry\TelemetryBase.cs" || exit /b 1
-
-      ## ALL BUT INSTALLER BUILDING
-        - task: VSBuild@1
-          displayName: Build PowerToys main project
-          inputs:
-            solution: '**\PowerToys.sln'
-            vsVersion: 17.0
-            msbuildArgs: -restore -graph /p:RestorePackagesConfig=true /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            clean: true
-            maximumCpuCount: true
-
-        ### BEGIN SECTION - build and sign nuget packages for abstracted UI utils
-        - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-          displayName: Sign Utilities libraries
-          inputs:
-            ${{ insert }}: ${{ parameters.signingParameters }}
-            FolderPath: 'src/modules'
-            signType: batchSigning
-            batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_abstracted_utils_dll.json'
-            ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-        - task: VSBuild@1
-          displayName: Create Hosts File Editor package
-          inputs:
-            solution: '**\HostsUILib.csproj'
-            vsVersion: 17.0
-            msbuildArgs: /p:CIBuild=true -t:pack /bl:$(Build.SourcesDirectory)\msbuild.binlog
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Create Environment Variables Editor package
-          inputs:
-            solution: '**\EnvironmentVariablesUILib.csproj'
-            vsVersion: 17.0
-            msbuildArgs: /p:CIBuild=true -t:pack /bl:$(Build.SourcesDirectory)\msbuild.binlog
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Create Registry Preview package
-          inputs:
-            solution: '**\RegistryPreviewUILib.csproj'
-            vsVersion: 17.0
-            msbuildArgs: /p:CIBuild=true -t:pack /bl:$(Build.SourcesDirectory)\msbuild.binlog
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: CopyFiles@2
-          displayName: Copying nuget packages file over
-          inputs:
-            contents: "**/bin/Release/PowerToys*.nupkg"
-            flattenFolders: True
-            targetFolder: $(Build.ArtifactStagingDirectory)/nupkg
-
-        - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-          displayName: Submit *.nupkg to ESRP for code signing
-          inputs:
-            ${{ insert }}: ${{ parameters.signingParameters }}
-            FolderPath: $(Build.ArtifactStagingDirectory)/nupkg
-            Pattern: '*.nupkg'
-            UseMinimatch: true
-            signConfigType: inlineSignParams
-            inlineOperation: >-
-              [
-                  {
-                      "KeyCode": "CP-401405",
-                      "OperationCode": "NuGetSign",
-                      "Parameters": {},
-                      "ToolName": "sign",
-                      "ToolVersion": "1.0"
-                  },
-                  {
-                      "KeyCode": "CP-401405",
-                      "OperationCode": "NuGetVerify",
-                      "Parameters": {},
-                      "ToolName": "sign",
-                      "ToolVersion": "1.0"
-                  }
-              ]
-        ### END SECTION - build and sign nuget packages for abstracted UI utils
-
-        - task: VSBuild@1
-          displayName: Build BugReportTool
-          inputs:
-            solution: '**/tools/BugReportTool/BugReportTool.sln'
-            vsVersion: 17.0
-            msbuildArgs: -restore -graph /p:RestorePackagesConfig=true /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            clean: true
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Build WebcamReportTool
-          inputs:
-            solution: '**/tools/WebcamReportTool/WebcamReportTool.sln'
-            vsVersion: 17.0
-            msbuildArgs: -restore -graph /p:RestorePackagesConfig=true /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            clean: true
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Build StylesReportTool
-          inputs:
-            solution: '**/tools/StylesReportTool/StylesReportTool.sln'
-            vsVersion: 17.0
-            msbuildArgs: -restore -graph /p:RestorePackagesConfig=true /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:CIBuild=true /bl:$(Build.SourcesDirectory)\msbuild.binlog
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            clean: true
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Publish Settings for Packaging
-          inputs:
-            solution: 'src/settings-ui/Settings.UI/PowerToys.Settings.csproj'
-            vsVersion: 17.0
-            msbuildArgs: >-
-              /target:Publish
-              /graph
-              /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
-              /p:VCRTForwarders-IncludeDebugCRT=false
-              /p:PowerToysRoot=$(Build.SourcesDirectory)
-              /p:PublishProfile=InstallationPublishProfile.pubxml
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Publish Launcher for Packaging
-          inputs:
-            solution: 'src/modules/launcher/PowerLauncher/PowerLauncher.csproj'
-            vsVersion: 17.0
-            # The arguments should be the same as the ones for Settings; make sure they are.
-            msbuildArgs: >-
-              /target:Publish
-              /graph
-              /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
-              /p:VCRTForwarders-IncludeDebugCRT=false
-              /p:PowerToysRoot=$(Build.SourcesDirectory)
-              /p:PublishProfile=InstallationPublishProfile.pubxml
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Publish Monaco Preview Handler for Packaging
-          inputs:
-            solution: 'src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj'
-            vsVersion: 17.0
-            # The arguments should be the same as the ones for Settings; make sure they are.
-            msbuildArgs: >-
-              /target:Publish
-              /graph
-              /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
-              /p:VCRTForwarders-IncludeDebugCRT=false
-              /p:PowerToysRoot=$(Build.SourcesDirectory)
-              /p:PublishProfile=InstallationPublishProfile.pubxml
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Publish Markdown Preview Handler for Packaging
-          inputs:
-            solution: 'src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj'
-            vsVersion: 17.0
-            # The arguments should be the same as the ones for Settings; make sure they are.
-            msbuildArgs: >-
-              /target:Publish
-              /graph
-              /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
-              /p:VCRTForwarders-IncludeDebugCRT=false
-              /p:PowerToysRoot=$(Build.SourcesDirectory)
-              /p:PublishProfile=InstallationPublishProfile.pubxml
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Publish Svg Preview Handler for Packaging
-          inputs:
-            solution: 'src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj'
-            vsVersion: 17.0
-            # The arguments should be the same as the ones for Settings; make sure they are.
-            msbuildArgs: >-
-              /target:Publish
-              /graph
-              /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
-              /p:VCRTForwarders-IncludeDebugCRT=false
-              /p:PowerToysRoot=$(Build.SourcesDirectory)
-              /p:PublishProfile=InstallationPublishProfile.pubxml
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Publish Svg Thumbnail Provider for Packaging
-          inputs:
-            solution: 'src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj'
-            vsVersion: 17.0
-            # The arguments should be the same as the ones for Settings; make sure they are.
-            msbuildArgs: >-
-              /target:Publish
-              /graph
-              /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
-              /p:VCRTForwarders-IncludeDebugCRT=false
-              /p:PowerToysRoot=$(Build.SourcesDirectory)
-              /p:PublishProfile=InstallationPublishProfile.pubxml
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        - task: VSBuild@1
-          displayName: Publish File Locksmith UI for Packaging
-          inputs:
-            solution: 'src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj'
-            vsVersion: 17.0
-            # The arguments should be the same as the ones for Settings; make sure they are.
-            msbuildArgs: >-
-              /target:Publish
-              /graph
-              /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
-              /p:VCRTForwarders-IncludeDebugCRT=false
-              /p:PowerToysRoot=$(Build.SourcesDirectory)
-              /p:PublishProfile=InstallationPublishProfile.pubxml
-            platform: $(BuildPlatform)
-            configuration: $(BuildConfiguration)
-            maximumCpuCount: true
-
-        # Check if deps.json files don't reference different dll versions.
-        - task: PowerShell@2
-          displayName: Audit deps.json files for all applications
-          inputs:
-            filePath: '.pipelines/verifyDepsJsonLibraryVersions.ps1'
-            arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
-            pwsh: true
-
-        # Check if asset files on the main application paths are playing nice and avoiding basic conflicts.
-        - task: PowerShell@2
-          displayName: Audit base applications path asset conflicts
-          inputs:
-            filePath: '.pipelines/verifyPossibleAssetConflicts.ps1'
-            arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
-            pwsh: true
-
-        - task: PowerShell@2
-          displayName: Audit WinAppSDK applications path asset conflicts
-          inputs:
-            filePath: '.pipelines/verifyPossibleAssetConflicts.ps1'
-            arguments: -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)\WinUI3Apps'
-            pwsh: true
-
-      #### MAIN SIGNING AREA
-      # reference https://dev.azure.com/microsoft/Dart/_git/AppDriver?path=/ESRPSigning.json&version=GBarm64-netcore&_a=contents for winappdriver
-      # https://dev.azure.com/microsoft/Dart/_git/AppDriver?path=/CIPolicy.xml&version=GBarm64-netcore&_a=contents
-
-        - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-          displayName: Sign Core PT
-          inputs:
-            ${{ insert }}: ${{ parameters.signingParameters }}
-            FolderPath: '$(BuildPlatform)/$(BuildConfiguration)' # Video conf uses x86 and x64.
-            signType: batchSigning
-            batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_core.json'
-            ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-        - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-          displayName: Sign DSC Powershell files
-          inputs:
-            ${{ insert }}: ${{ parameters.signingParameters }}
-            FolderPath: 'src/dsc/Microsoft.PowerToys.Configure'
-            signType: batchSigning
-            batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_DSC.json'
-            ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-        - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@5
-          displayName: Sign x86 directshow VCM
-          inputs:
-            ${{ insert }}: ${{ parameters.signingParameters }}
-            FolderPath: 'x86/$(BuildConfiguration)' # Video conf uses x86 and x64.
-            signType: batchSigning
-            batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_vcm.json'
-            ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-      #### END SIGNING 
-      ## END MAIN
-
-        - pwsh: |-
-            Move-Item msbuild.binlog "$(Build.ArtifactStagingDirectory)/"
-          displayName: Stage binlog into artifact directory
-          condition: always()
-
-        - task: ComponentGovernanceComponentDetection@0
-          displayName: Component Detection
-
-        - task: CopyFiles@2
-          displayName: Copying files for symbols
-          inputs:
-            contents: >-
-              **/*.pdb
-            flattenFolders: True
-            targetFolder: $(Build.ArtifactStagingDirectory)/Symbols-$(BuildPlatform)/
-         
-        - task: PowerShell@2
-          displayName: 'Remove unneeded files from ArtifactStagingDirectory'
-          inputs:
-            targetType: 'inline'
-            script: |
-              cd $(Build.ArtifactStagingDirectory)/Symbols-$(BuildPlatform)/
-              Remove-Item vc143.pdb
-              Remove-Item *test*
-
-        - task: PublishSymbols@2
-          displayName: Publish symbols path
-          continueOnError: True
-          inputs:
-            SearchPattern: |
-              $(Build.ArtifactStagingDirectory)/Symbols-$(BuildPlatform)/**/*.*
-            IndexSources: false
-            SymbolServerType: TeamServices
-            
-        - template: .pipelines/installer-steps.yml@self
-          parameters:
-            signingParameters: ${{ parameters.signingParameters }}
-            versionNumber: ${{ parameters.versionNumber }}
-            perUserArg: "false"
-            buildSubDir: "MachineSetup"
-            installerPrefix: "PowerToysSetup"
-
-        - task: PowerShell@2
-          displayName: Clean installer dir before building per-user installer
-          inputs:
-            targetType: inline
-            script: git clean -xfd  -e *exe -- .\installer\
-            pwsh: true
-
-        - template: .pipelines/installer-steps.yml@self
-          parameters:
-            signingParameters: ${{ parameters.signingParameters }}
-            versionNumber: ${{ parameters.versionNumber }}
-            perUserArg: "true"
-            buildSubDir: "UserSetup"
-            installerPrefix: "PowerToysUserSetup"
-
-        - task: CopyFiles@2
-          displayName: Copying setup file over
-          inputs:
-            contents: "**/PowerToys*Setup-*.exe"
-            flattenFolders: True
-            targetFolder: $(Build.ArtifactStagingDirectory)
-
-        - task: PowerShell@2
-          displayName: 'Calculating SHA256 hash'
-          inputs:
-            targetType: 'inline'
-            script: |
-              $p = "$(System.ArtifactsDirectory)\";
-              $staging = "$(Build.ArtifactStagingDirectory)\"
-              $userHash = ((get-item $p\PowerToysUserSetup*.exe | Get-FileHash).Hash);
-              $machineHash = ((get-item $p\PowerToysSetup*.exe | Get-FileHash).Hash);
-              $userPlat = "hash_user_$(BuildPlatform).txt";
-              $machinePlat = "hash_machine_$(BuildPlatform).txt";
-              $combinedUserPath = $staging + $userPlat;
-              $combinedMachinePath = $staging + $machinePlat;
-              
-              echo $p
-
-              echo $userPlat
-              echo $userHash
-              echo $combinedUserPath
-
-              echo $machinePlat
-              echo $machineHash
-              echo $combinedMachinePath
-              
-              $userHash | out-file -filepath $combinedUserPath
-              $machineHash | out-file -filepath $combinedMachinePath
-            pwsh: true
-
-        # Publishing the GPO files
-        - pwsh: |-
-            New-Item "$(Build.ArtifactStagingDirectory)/gpo" -Type Directory
-            Copy-Item src\gpo\assets\* "$(Build.ArtifactStagingDirectory)/gpo" -Recurse
-          displayName: Stage the GPO files
-
-...

.pipelines/tsa.json

@@ -3,5 +3,5 @@
     "notificationAliases": ["powertoys@microsoft.com"],
     "instanceUrl": "https://microsoft.visualstudio.com",
     "projectName": "OS",
-    "areaPath": "OS\\Windows Client and Services\\ADEPT\\E4D-Engineered for Developers\\SHINE\\PowerToys"
+    "areaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys"
 }

.pipelines/v2/ci.yml

@@ -0,0 +1,46 @@
+trigger:
+  batch: true
+  branches:
+    include:
+      - main
+      - stable
+  paths:
+    exclude:
+      - doc/*
+      - temp/*
+      - tools/*
+      - '**.md'
+
+pr:
+  branches:
+    include:
+      - main
+      - stable
+  paths:
+    exclude:
+      - '**.md'
+      - doc
+
+name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
+
+parameters:
+  - name: buildPlatforms
+    type: object
+    default:
+      - x64
+      - arm64
+  - name: enableMsBuildCaching
+    type: boolean
+    displayName: "Enable MSBuild Caching"
+    default: true
+  - name: runTests
+    type: boolean
+    displayName: "Run Tests"
+    default: true
+
+extends:
+  template: templates/pipeline-ci-build.yml
+  parameters:
+    buildPlatforms: ${{ parameters.buildPlatforms }}
+    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+    runTests: ${{ parameters.runTests }}

.pipelines/v2/release.yml

@@ -0,0 +1,106 @@
+trigger: none
+pr: none
+
+resources:
+  repositories:
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+
+# Expose all of these parameters for user configuration.
+parameters:
+  - name: publishSymbolsToPublic
+    displayName: "Publish Symbols to **PUBLIC** (use only for Final Builds)"
+    type: boolean
+    default: false
+
+  - name: versionNumber
+    displayName: "Version Number"
+    type: string
+    default: '0.0.1'
+
+  - name: buildConfigurations
+    displayName: "Build Configurations"
+    type: object
+    default:
+      - Release
+
+  - name: buildPlatforms
+    displayName: "Build Platforms"
+    type: object
+    default:
+      - x64
+      - arm64
+
+name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    customBuildTags:
+    - 1ES.PT.ViaStartRight
+    pool:
+      name: SHINE-INT-S
+      image: SHINE-VS17-Latest
+      os: windows
+    sdl:
+      tsa:
+        enabled: true
+        configFile: '$(Build.SourcesDirectory)\.pipelines\tsa.json'
+
+    stages:
+      - stage: Build
+        displayName: Build
+        dependsOn: []
+        jobs:
+          - template: .pipelines/v2/templates/job-build-project.yml@self
+            parameters:
+              pool:
+                name: SHINE-INT-L
+                image: SHINE-VS17-Latest
+                os: windows
+              variables:
+                IsPipeline: 1 # The installer uses this to detect whether it should pick up localizations
+                SkipCppCodeAnalysis: 1 # Skip the code analysis to speed up release CI. It runs on PR CI, anyway
+                # IsExperimentationLive: 1 # The build and installer use this to turn on experimentation
+              buildPlatforms: ${{ parameters.buildPlatforms }}
+              buildConfigurations: ${{ parameters.buildConfigurations }}
+              versionNumber: ${{ parameters.versionNumber }}
+              publishArtifacts: false # 1ES PT handles publication for us.
+              codeSign: true
+              runTests: false
+              signingIdentity:
+                serviceName: $(SigningServiceName)
+                appId: $(SigningAppId)
+                tenantId: $(SigningTenantId)
+                akvName: $(SigningAKVName)
+                authCertName: $(SigningAuthCertName)
+                signCertName: $(SigningSignCertName)
+              # Have msbuild use the release nuget config profile
+              additionalBuildOptions: /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config"
+              beforeBuildSteps:
+                # Sets versions for all PowerToy created DLLs
+                - pwsh: |-
+                    .pipelines/versionSetting.ps1 -versionNumber '${{ parameters.versionNumber }}' -DevEnvironment ''
+                  displayName: Prepare versioning
+
+                # Prepare the localizations and telemetry config before the release build
+                - template: .pipelines/v2/templates/steps-fetch-and-prepare-localizations.yml@self
+
+                - script: |
+                    call nuget.exe restore -configFile .pipelines/release-nuget.config -PackagesDirectory . .pipelines/packages.config || exit /b 1
+                    move /Y "Microsoft.PowerToys.Telemetry.2.0.0\build\include\TraceLoggingDefines.h" "src\common\Telemetry\TraceLoggingDefines.h" || exit /b 1
+                    move /Y "Microsoft.PowerToys.Telemetry.2.0.0\build\include\TelemetryBase.cs" "src\common\Telemetry\TelemetryBase.cs" || exit /b 1
+                  displayName: Emplace telemetry files
+
+      - stage: Publish
+        displayName: Publish
+        dependsOn: [Build]
+        jobs:
+          - template: .pipelines/v2/templates/job-publish-symbols-using-symbolrequestprod-api.yml@self
+            parameters:
+              versionNumber: ${{ parameters.versionNumber }}
+              includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
+              subscription: $(SymbolPublishingServiceConnection)
+              symbolProject: $(SymbolPublishingProject)

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

@@ -0,0 +1,538 @@
+parameters:
+  - name: additionalBuildOptions
+    type: string
+    default: ''
+  - name: buildConfigurations
+    type: object
+    default:
+      - Release
+  - name: buildPlatforms
+    type: object
+    default:
+      - x64
+      - arm64
+  - name: codeSign
+    type: boolean
+    default: false
+  - name: artifactStem
+    type: string
+    default: ''
+  - name: jobName
+    type: string
+    default: 'Build'
+  - name: condition
+    type: string
+    default: ''
+  - name: dependsOn
+    type: object
+    default: []
+  - name: pool
+    type: object
+    default: []
+  - name: beforeBuildSteps
+    type: stepList
+    default: []
+  - name: variables
+    type: object
+    default: {}
+  - name: publishArtifacts
+    type: boolean
+    default: true
+  - name: signingIdentity
+    type: object
+    default: {}
+  - name: enablePackageCaching
+    type: boolean
+    default: false
+  - name: enableMsBuildCaching
+    type: boolean
+    default: false
+  - name: runTests
+    type: boolean
+    default: true
+
+  - name: versionNumber
+    type: string
+    default: '0.0.1'
+  - name: csProjectsToPublish
+    type: object
+    default:
+      - 'src/settings-ui/Settings.UI/PowerToys.Settings.csproj'
+      - 'src/modules/launcher/PowerLauncher/PowerLauncher.csproj'
+      - 'src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj'
+      - 'src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj'
+      - 'src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj'
+      - 'src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj'
+      - 'src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithUI.csproj'
+
+jobs:
+- job: ${{ parameters.jobName }}
+  ${{ if ne(length(parameters.pool), 0) }}:
+    pool: ${{ parameters.pool }}
+  dependsOn: ${{ parameters.dependsOn }}
+  condition: ${{ parameters.condition }}
+  strategy:
+    matrix:
+      ${{ each config in parameters.buildConfigurations }}:
+        ${{ each platform in parameters.buildPlatforms }}:
+          ${{ config }}_${{ platform }}:
+            BuildConfiguration: ${{ config }}
+            BuildPlatform: ${{ platform }}
+            ${{ if eq(platform, 'x86') }}:
+              OutputBuildPlatform: Win32
+            ${{ elseif eq(platform, 'Any CPU') }}:
+              OutputBuildPlatform: AnyCPU
+            ${{ else }}:
+              OutputBuildPlatform: ${{ platform }}
+  variables:
+    # Azure DevOps abhors a vacuum
+    # If these are blank, expansion will fail later on... which will result in direct substitution of the variable *names*
+    # later on. We'll just... set them to a single space and if we need to, check IsNullOrWhiteSpace.
+    # Yup.
+    MSBuildCacheParameters: ' '
+    JobOutputDirectory: $(Build.ArtifactStagingDirectory)
+    LogOutputDirectory: $(Build.ArtifactStagingDirectory)\logs
+    JobOutputArtifactName: build-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.artifactStem }}
+    NUGET_RESTORE_MSBUILD_ARGS: /p:Platform=$(BuildPlatform) # Required for nuget to work due to self contained
+    NODE_OPTIONS: --max_old_space_size=16384
+    ${{ if eq(parameters.runTests, true) }}:
+      MSBuildMainBuildTargets: Build;Test
+    ${{ else }}:
+      MSBuildMainBuildTargets: Build
+    ${{ insert }}: ${{ parameters.variables }}
+  displayName: Build
+  timeoutInMinutes: 240
+  cancelTimeoutInMinutes: 1
+  templateContext: # Required when this template is hosted in 1ES PT
+    outputs:
+    - output: pipelineArtifact
+      artifactName: $(JobOutputArtifactName)
+      targetPath: $(Build.ArtifactStagingDirectory)
+  steps:
+  - checkout: self
+    clean: true
+    submodules: true
+    persistCredentials: True
+    fetchTags: false
+    fetchDepth: 1
+
+  - ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+    - pwsh: |-
+        $MSBuildCacheParameters = ""
+        $MSBuildCacheParameters += " -graph"
+        $MSBuildCacheParameters += " -reportfileaccesses"
+        $MSBuildCacheParameters += " -p:MSBuildCacheEnabled=true"
+        $MSBuildCacheParameters += " -p:MSBuildCacheLogDirectory=$(LogOutputDirectory)\MSBuildCacheLogs"
+        Write-Host "MSBuildCacheParameters: $MSBuildCacheParameters"
+        Write-Host "##vso[task.setvariable variable=MSBuildCacheParameters]$MSBuildCacheParameters"
+      displayName: Prepare MSBuildCache variables
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    # Only required if we're using ESRP
+    - template: steps-ensure-dotnet-version.yml
+      parameters:
+        sdk: true
+        version: '6.0'
+
+  - template: steps-ensure-dotnet-version.yml
+    parameters:
+      sdk: true
+      version: '8.0'
+
+  - ${{ if eq(parameters.runTests, true) }}:
+    - task: VisualStudioTestPlatformInstaller@1
+      displayName: Ensure VSTest Platform
+
+  - pwsh: |-
+      & '.pipelines/applyXamlStyling.ps1' -Passive
+      & '.pipelines/verifyNugetPackages.ps1' -solution '$(build.sourcesdirectory)\PowerToys.sln'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\PowerToys.sln'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\tools\BugReportTool\BugReportTool.sln'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\tools\WebcamReportTool\WebcamReportTool.sln'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\tools\StylesReportTool\StylesReportTool.sln'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\installer\PowerToysSetup.sln'
+    displayName: Verify formatting, nuget, and ARM64 configurations
+
+  - ${{ if eq(parameters.enablePackageCaching, true) }}:
+    - task: Cache@2
+      displayName: 'Cache nuget packages (PackageReference)'
+      inputs:
+        key: '"PackageReference" | "$(Agent.OS)" | Directory.Packages.props'
+        restoreKeys: |
+           "PackageReference" | "$(Agent.OS)"
+           "PackageReference"
+        path: $(NUGET_PACKAGES)
+
+    - task: Cache@2
+      displayName: 'Cache nuget packages (packages.config)'
+      inputs:
+        key: '"packages.config" | "$(Agent.OS)" | **/packages.config'
+        restoreKeys: |
+           "packages.config" | "$(Agent.OS)"
+           "packages.config"
+        path: packages
+
+  - template: .\steps-restore-nuget.yml
+
+  - pwsh: |-
+      & "$(build.sourcesdirectory)\.pipelines\verifyAndSetLatestVCToolsVersion.ps1"
+    displayName: Work around DD-1541167 (VCToolsVersion)
+
+  - pwsh: |-
+      & "$(build.sourcesdirectory)\.pipelines\installWiX.ps1"
+    displayName: Download and install WiX 3.14 development build
+
+  - ${{ parameters.beforeBuildSteps }}
+
+  - task: VSBuild@1
+    ${{ if eq(parameters.runTests, true) }}:
+      displayName: Build and Test PowerToys main project
+    ${{ else }}:
+      displayName: Build PowerToys main project
+    inputs:
+      solution: 'PowerToys.sln'
+      vsVersion: 17.0
+      msbuildArgs: >-
+        -restore -graph
+        /p:RestorePackagesConfig=true
+        /p:CIBuild=true
+        /bl:$(LogOutputDirectory)\build-0-main.binlog
+        ${{ parameters.additionalBuildOptions }}
+        $(MSBuildCacheParameters)
+        /t:$(MSBuildMainBuildTargets)
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: Sign Utilities
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'src/modules'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_abstracted_utils_dll.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+  - task: VSBuild@1
+    displayName: Create Hosts File Editor package
+    inputs:
+      solution: '**\HostsUILib.csproj'
+      vsVersion: 17.0
+      msbuildArgs: /p:CIBuild=true;NoBuild=true -t:pack /bl:$(LogOutputDirectory)\build-hosts.binlog
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+  - task: VSBuild@1
+    displayName: Create Environment Variables Editor package
+    inputs:
+      solution: '**\EnvironmentVariablesUILib.csproj'
+      vsVersion: 17.0
+      msbuildArgs: /p:CIBuild=true;NoBuild=true -t:pack /bl:$(LogOutputDirectory)\build-env-var-editor.binlog
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+  - task: VSBuild@1
+    displayName: Create Registry Preview package
+    inputs:
+      solution: '**\RegistryPreviewUILib.csproj'
+      vsVersion: 17.0
+      msbuildArgs: /p:CIBuild=true;NoBuild=true -t:pack /bl:$(LogOutputDirectory)\build-registry-preview.binlog
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+  - task: CopyFiles@2
+    displayName: Stage NuGet packages
+    inputs:
+      contents: "**/bin/Release/PowerToys*.nupkg"
+      flattenFolders: True
+      targetFolder: $(JobOutputDirectory)/nupkg
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: Sign NuGet packages
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: $(JobOutputDirectory)/nupkg
+          Pattern: '*.nupkg'
+          UseMinimatch: true
+          signConfigType: inlineSignParams
+          inlineOperation: >-
+            [
+                {
+                    "KeyCode": "CP-401405",
+                    "OperationCode": "NuGetSign",
+                    "Parameters": {},
+                    "ToolName": "sign",
+                    "ToolVersion": "1.0"
+                },
+                {
+                    "KeyCode": "CP-401405",
+                    "OperationCode": "NuGetVerify",
+                    "Parameters": {},
+                    "ToolName": "sign",
+                    "ToolVersion": "1.0"
+                }
+            ]
+
+  - task: VSBuild@1
+    displayName: Build BugReportTool
+    inputs:
+      solution: '**/tools/BugReportTool/BugReportTool.sln'
+      vsVersion: 17.0
+      msbuildArgs: >-
+        -restore -graph
+        /p:RestorePackagesConfig=true
+        /p:CIBuild=true
+        /bl:$(LogOutputDirectory)\build-bug-report.binlog
+        ${{ parameters.additionalBuildOptions }}
+        $(MSBuildCacheParameters)
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+  - task: VSBuild@1
+    displayName: Build WebcamReportTool
+    inputs:
+      solution: '**/tools/WebcamReportTool/WebcamReportTool.sln'
+      vsVersion: 17.0
+      msbuildArgs: >-
+        -restore -graph
+        /p:RestorePackagesConfig=true
+        /p:CIBuild=true
+        /bl:$(LogOutputDirectory)\build-webcam-report.binlog
+        ${{ parameters.additionalBuildOptions }}
+        $(MSBuildCacheParameters)
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+  - task: VSBuild@1
+    displayName: Build StylesReportTool
+    inputs:
+      solution: '**/tools/StylesReportTool/StylesReportTool.sln'
+      vsVersion: 17.0
+      msbuildArgs: >-
+        -restore -graph
+        /p:RestorePackagesConfig=true
+        /p:CIBuild=true
+        /bl:$(LogOutputDirectory)\build-styles-report.binlog
+        ${{ parameters.additionalBuildOptions }}
+        $(MSBuildCacheParameters)
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+    ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
+
+  - ${{ each project in parameters.csProjectsToPublish }}:
+    - task: VSBuild@1
+      displayName: Publish ${{ project }} for Packaging
+      inputs:
+        solution: ${{ project }}
+        vsVersion: 17.0
+        msbuildArgs: >-
+          /target:Publish
+          /graph
+          /p:Configuration=$(BuildConfiguration);Platform=$(BuildPlatform);AppxBundle=Never
+          /p:VCRTForwarders-IncludeDebugCRT=false
+          /p:PowerToysRoot=$(Build.SourcesDirectory)
+          /p:PublishProfile=InstallationPublishProfile.pubxml
+          /bl:$(LogOutputDirectory)\publish-${{ join('_',split(project, '/')) }}.binlog
+        platform: $(BuildPlatform)
+        configuration: $(BuildConfiguration)
+        msbuildArchitecture: x64
+        maximumCpuCount: true
+
+  # Check if deps.json files don't reference different dll versions.
+  - pwsh: |-
+      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
+    displayName: Audit deps.json files for all applications
+
+  # Check if asset files on the main application paths are playing nice and avoiding basic conflicts.
+  - pwsh: |-
+      & '.pipelines/verifyPossibleAssetConflicts.ps1' -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)'
+    displayName: Audit base applications path asset conflicts
+
+  - pwsh: |-
+      & '.pipelines/verifyPossibleAssetConflicts.ps1' -targetDir '$(build.sourcesdirectory)\$(BuildPlatform)\$(BuildConfiguration)\WinUI3Apps'
+    displayName: Audit WinAppSDK applications path asset conflicts
+
+  - pwsh: |-
+      & '.pipelines/verifyNoticeMdAgainstNugetPackages.ps1' -path '$(build.sourcesdirectory)\'
+    displayName: Verify NOTICE.md and NuGet packages match
+
+  - ${{ if eq(parameters.runTests, true) }}:
+    # Publish test results which ran in MSBuild
+    - task: PublishTestResults@2
+      displayName: 'Publish Test Results'
+      inputs:
+        testResultsFormat: VSTest
+        testResultsFiles: '**/*.trx'
+      condition: ne(variables['BuildPlatform'],'arm64')
+
+    # Native dlls
+    - task: VSTest@2
+      condition: ne(variables['BuildPlatform'],'arm64') # No arm64 agents to run the tests.
+      displayName: 'Native Tests'
+      inputs:
+        platform: '$(BuildPlatform)'
+        configuration: '$(BuildConfiguration)'
+        testSelector: 'testAssemblies'
+        testAssemblyVer2: |
+          **\KeyboardManagerEngineTest.dll
+          **\KeyboardManagerEditorTest.dll
+          **\UnitTests-CommonLib.dll
+          **\PowerRenameUnitTests.dll
+          **\UnitTests-FancyZones.dll
+          !**\obj\**
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: Sign Core PowerToys
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: '$(BuildPlatform)/$(BuildConfiguration)' # Video conf uses x86 and x64.
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_core.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: Sign DSC files
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'src/dsc/Microsoft.PowerToys.Configure'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_DSC.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: Sign x86 DirectShow VCM
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'x86/$(BuildConfiguration)' # Video conf uses x86 and x64.
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_vcm.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+  - template: steps-build-installer.yml
+    parameters:
+      codeSign: ${{ parameters.codeSign }}
+      signingIdentity: ${{ parameters.signingIdentity }}
+      versionNumber: ${{ parameters.versionNumber }}
+      additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
+
+  - template: steps-build-installer.yml
+    parameters:
+      codeSign: ${{ parameters.codeSign }}
+      signingIdentity: ${{ parameters.signingIdentity }}
+      versionNumber: ${{ parameters.versionNumber }}
+      additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
+      buildUserInstaller: true # NOTE: This is the distinction between the above and below rules
+
+  # This saves ~1GiB per architecture. We won't need these later.
+  # Removes:
+  # - All .pdbs from any static libs .libs (which were only used during linking)
+  - pwsh: |-
+      $binDir = '$(Build.SourcesDirectory)'
+      $ImportLibs = Get-ChildItem $binDir -Recurse -File -Filter '*.exp' | ForEach-Object { $_.FullName -Replace "exp$","lib" }
+      $StaticLibs = Get-ChildItem $binDir -Recurse -File -Filter '*.lib' | Where-Object FullName -NotIn $ImportLibs
+
+      $Items = @()
+      $Items += Get-Item ($StaticLibs.FullName -Replace "lib$","pdb") -ErrorAction:Ignore
+
+      $Items | Remove-Item -Recurse -Force -Verbose -ErrorAction:Ignore
+    displayName: Clean up static libs PDBs
+    errorActionPreference: silentlyContinue # It's OK if this silently fails
+
+  - task: CopyFiles@2
+    displayName: Stage Installers
+    inputs:
+      contents: "**/PowerToys*Setup-*.exe"
+      flattenFolders: True
+      targetFolder: $(JobOutputDirectory)
+
+  - task: CopyFiles@2
+    displayName: Stage Symbols
+    inputs:
+      contents: |-
+        **\*.pdb
+        !**\vc143.pdb
+        !**\*test*.pdb
+      flattenFolders: True
+      targetFolder: $(JobOutputDirectory)/symbols-$(BuildPlatform)/
+
+  - pwsh: |-
+      $p = "$(JobOutputDirectory)\"
+      $userHash = ((Get-Item $p\PowerToysUserSetup*.exe | Get-FileHash).Hash);
+      $machineHash = ((Get-Item $p\PowerToysSetup*.exe | Get-FileHash).Hash);
+      $userPlat = "hash_user_$(BuildPlatform).txt";
+      $machinePlat = "hash_machine_$(BuildPlatform).txt";
+      $combinedUserPath = $p + $userPlat;
+      $combinedMachinePath = $p + $machinePlat;
+      
+      echo $p
+
+      echo $userPlat
+      echo $userHash
+      echo $combinedUserPath
+
+      echo $machinePlat
+      echo $machineHash
+      echo $combinedMachinePath
+      
+      $userHash | out-file -filepath $combinedUserPath
+      $machineHash | out-file -filepath $combinedMachinePath
+    displayName: Calculate file hashes
+
+  # Publishing the GPO files
+  - pwsh: |-
+      New-Item "$(JobOutputDirectory)/gpo" -Type Directory
+      Copy-Item src\gpo\assets\* "$(JobOutputDirectory)/gpo" -Recurse
+    displayName: Stage GPO files
+
+  # Running the tests may result in future jobs consuming artifacts out of this build
+  - ${{ if eq(parameters.runTests, true) }}:
+    - task: CopyFiles@2
+      displayName: Stage entire build output
+      inputs:
+        sourceFolder: '$(Build.SourcesDirectory)'
+        contents: '$(BuildPlatform)/$(BuildConfiguration)/**/*'
+        targetFolder: '$(JobOutputDirectory)\$(BuildPlatform)\$(BuildConfiguration)'
+
+  - ${{ if eq(parameters.publishArtifacts, true) }}:
+    - publish: $(JobOutputDirectory)
+      artifact: $(JobOutputArtifactName)
+      displayName: Publish all outputs
+      condition: always()

.pipelines/v2/templates/job-ci-precheck.yml

@@ -0,0 +1,30 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/master/service-schema.json
+jobs:
+- job: Precheck
+  pool:
+    vmImage: windows-2022
+  steps:
+  - checkout: none
+
+  - pwsh: |-
+      try {
+        # Try based on pull request first
+        $pullRequestNumber = "$(system.pullRequest.pullRequestNumber)";
+        $gitHubPullRequest = Invoke-RestMethod -Method Get "https://api.github.com/repos/microsoft/PowerToys/pulls/$pullRequestNumber/files"
+        # If there are no files updated in the commit that are .md, set skipBuild variable
+        if(([array]($gitHubPullRequest.filename) -notmatch ".md|.txt").Length -eq 0) {
+            Write-Host '##vso[task.setvariable variable=skipBuild;isOutput=true]Yes'
+            Write-Host 'Skipping Build'
+        }
+      }
+      catch {
+        # Fall back to the latest commit otherwise.
+        $commit = "$(build.sourceVersion)";
+        $gitHubCommit = Invoke-RestMethod -Method Get "https://api.github.com/repos/microsoft/PowerToys/commits/$commit"
+        if(([array]($githubCommit.files.filename) -notmatch ".md|.txt").Length -eq 0) {
+          Write-Host '##vso[task.setvariable variable=skipBuild;isOutput=true]Yes'
+          Write-Host 'Skipping Build'
+        }
+      }
+    displayName: Verify whether we need to build at all
+    name: verifyBuildRequest

.pipelines/v2/templates/job-publish-symbols-using-symbolrequestprod-api.yml

@@ -0,0 +1,116 @@
+parameters:
+  - name: includePublicSymbolServer
+    type: boolean
+    default: false
+  - name: pool
+    type: object
+    default: []
+  - name: dependsOn
+    type: object
+    default: null
+  - name: versionNumber
+    type: string
+    default: '0.0.1'
+  - name: artifactStem
+    type: string
+    default: ''
+  - name: jobName
+    type: string
+    default: PublishSymbols
+  - name: symbolExpiryTime
+    type: string
+    default: 36530 # This is the default from PublishSymbols@2
+  - name: variables
+    type: object
+    default: {}
+  - name: subscription
+    type: string
+  - name: symbolProject
+    type: string
+
+jobs:
+- job: ${{ parameters.jobName }}
+  ${{ if ne(length(parameters.pool), 0) }}:
+    pool: ${{ parameters.pool }}
+  ${{ if eq(parameters.includePublicSymbolServer, true) }}:
+    displayName: Publish Symbols to Internal and MSDL
+  ${{ else }}:
+    displayName: Publish Symbols Internally
+  dependsOn: ${{ parameters.dependsOn }}
+  variables:
+    ${{ insert }}: ${{ parameters.variables }}
+    SymbolsArtifactName: "PowerToys_${{parameters.versionNumber}}_$(Build.BuildNumber)"
+  steps:
+  - checkout: self
+    clean: true
+    fetchDepth: 1
+    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
+    submodules: true
+    persistCredentials: True
+
+  - task: DownloadPipelineArtifact@2
+    displayName: Download all PDBs from all prior build phases
+    inputs:
+      itemPattern: '**/*.pdb'
+      targetPath: '$(Build.SourcesDirectory)/symbolStaging'
+
+  - powershell: |-
+      Get-PackageProvider -Name NuGet -ForceBootstrap
+      Install-Module -Verbose -AllowClobber -Force Az.Accounts, Az.Storage, Az.Network, Az.Resources, Az.Compute
+    displayName: Install Azure Module Dependencies
+
+  # Transit the Azure token from the Service Connection into a secret variable for the rest of the pipeline to use.
+  - task: AzurePowerShell@5
+    displayName: Generate an Azure Token
+    inputs:
+      azureSubscription: ${{ parameters.subscription }}
+      azurePowerShellVersion: LatestVersion
+      pwsh: true
+      ScriptType: InlineScript
+      Inline: |-
+        $AzToken = (Get-AzAccessToken -ResourceUrl api://30471ccf-0966-45b9-a979-065dbedb24c1).Token
+        Write-Host "##vso[task.setvariable variable=SymbolAccessToken;issecret=true]$AzToken"
+
+
+  - task: PublishSymbols@2
+    displayName: Publish Symbols (to current Azure DevOps tenant)
+    continueOnError: True
+    inputs:
+      SymbolsFolder: '$(Build.SourcesDirectory)/symbolStaging'
+      SearchPattern: '**/*.pdb'
+      IndexSources: false
+      DetailedLog: true
+      SymbolsMaximumWaitTime: 30
+      SymbolServerType: 'TeamServices'
+      SymbolsProduct: 'PowerToys Converged Symbols'
+      SymbolsVersion: '${{ parameters.versionNumber }}'
+      SymbolsArtifactName: $(SymbolsArtifactName)
+      SymbolExpirationInDays: ${{ parameters.symbolExpiryTime }}
+    env:
+      LIB: $(Build.SourcesDirectory)
+
+  - pwsh: |-
+      # Prepare the defaults for IRM
+      $PSDefaultParameterValues['Invoke-RestMethod:Headers'] = @{ Authorization = "Bearer $(SymbolAccessToken)" }
+      $PSDefaultParameterValues['Invoke-RestMethod:ContentType'] = "application/json"
+      $PSDefaultParameterValues['Invoke-RestMethod:Method'] = "POST"
+
+      $BaseUri = "https://symbolrequestprod.trafficmanager.net/projects/${{ parameters.symbolProject }}/requests"
+
+      # Prepare the request
+      $expiration = (Get-Date).Add([TimeSpan]::FromDays(${{ parameters.symbolExpiryTime }}))
+      $createRequestBody = @{
+        requestName = "$(SymbolsArtifactName)";
+        expirationTime = $expiration.ToString();
+      }
+      Write-Host "##[debug]Starting request $($createRequestBody.requestName) with expiration date of $($createRequestBody.expirationTime)"
+      Invoke-RestMethod -Uri "$BaseUri" -Body ($createRequestBody | ConvertTo-Json -Compress) -Verbose
+
+      # Request symbol publication
+      $publishRequestBody = @{
+        publishToInternalServer = $true;
+        publishToPublicServer = $${{ parameters.includePublicSymbolServer }};
+      }
+      Write-Host "##[debug]Submitting request $($createRequestBody.requestName) ($($publishRequestBody | ConvertTo-Json -Compress))"
+      Invoke-RestMethod -Uri "$BaseUri/$($createRequestBody.requestName)" -Body ($publishRequestBody | ConvertTo-Json -Compress) -Verbose
+    displayName: Publish Symbols using internal REST API

.pipelines/v2/templates/job-test-project.yml

@@ -0,0 +1,76 @@
+parameters:
+  - name: configuration
+    type: string
+    default: "Release"
+  - name: platform
+    type: string
+    default: ""
+  - name: inputArtifactStem
+    type: string
+    default: ""
+
+jobs:
+- job: Test${{ parameters.platform }}${{ parameters.configuration }}
+  displayName: Test ${{ parameters.platform }} ${{ parameters.configuration }}
+  variables:
+    BuildPlatform: ${{ parameters.platform }}
+    BuildConfiguration: ${{ parameters.configuration }}
+    SrcPath: $(Build.Repository.LocalPath)
+  pool:
+    ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
+      ${{ if ne(parameters.platform, 'ARM64') }}:
+        name: SHINE-INT-Testing-x64
+      ${{ else }}:
+        name: SHINE-INT-Testing-arm64
+    ${{ else }}:
+      ${{ if ne(parameters.platform, 'ARM64') }}:
+        name: SHINE-OSS-Testing-x64
+      ${{ else }}:
+        name: SHINE-OSS-Testing-arm64
+  steps:
+  - checkout: self
+    submodules: false
+    clean: true
+    fetchDepth: 1
+    fetchTags: false
+
+  - download: current
+    displayName: Download artifacts
+    artifact: build-${{ parameters.platform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}
+    patterns: |-
+      **
+      !**\*.pdb
+      !**\*.lib
+
+  - template: steps-ensure-dotnet-version.yml
+    parameters:
+      sdk: true
+      version: '8.0'
+
+  - task: VisualStudioTestPlatformInstaller@1
+    displayName: Ensure VSTest Platform
+
+  - pwsh: |-
+      & '$(build.sourcesdirectory)\.pipelines\InstallWinAppDriver.ps1'
+    displayName: Download and install WinAppDriver
+
+  - ${{ if ne(parameters.platform, 'arm64') }}:
+    - task: ScreenResolutionUtility@1
+      inputs:
+        displaySettings: 'optimal'
+
+  - task: VSTest@3
+    displayName: Run UI Tests
+    inputs:
+      platform: '$(BuildPlatform)'
+      configuration: '$(BuildConfiguration)'
+      testSelector: 'testAssemblies'
+      searchFolder: '$(Pipeline.Workspace)\build-${{ parameters.platform }}-${{ parameters.configuration }}${{ parameters.inputArtifactStem }}'
+      vsTestVersion: 'toolsInstaller'
+      uiTests: true
+      rerunFailedTests: true
+      testAssemblyVer2: |
+        **\UITests-FancyZones.dll
+        **\UITests-FancyZonesEditor.dll
+        !**\obj\**
+        !**\ref\**

.pipelines/v2/templates/pipeline-ci-build.yml

@@ -0,0 +1,62 @@
+variables:
+  - name: runCodesignValidationInjectionBG
+    value: false
+  - name: EnablePipelineCache
+    value: true
+  - ${{ if eq(parameters.enableMsBuildCaching, true) }}:
+    - name: EnablePipelineCache
+      value: true
+
+parameters:
+  - name: buildPlatforms
+    type: object
+    default:
+      - x64
+      - arm64
+  - name: enableMsBuildCaching
+    type: boolean
+    default: false
+  - name: runTests
+    type: boolean
+    default: true
+
+stages:
+  # Allow manual builds to skip pre-check
+  - ${{ if ne(variables['Build.Reason'], 'Manual') }}:
+    - stage: Precheck
+      jobs:
+        - template: job-ci-precheck.yml
+
+  - ${{ each platform in parameters.buildPlatforms }}:
+    - stage: Build_${{ platform }}
+      displayName: Build ${{ platform }}
+      ${{ if ne(variables['Build.Reason'], 'Manual') }}:
+        dependsOn: [Precheck]
+      ${{ else }}:
+        dependsOn: []
+      jobs:
+        - template: job-build-project.yml
+          parameters:
+            condition: and(succeeded(), or(eq(variables['Build.Reason'], 'Manual'), ne(stageDependencies.Precheck.Precheck.outputs['verifyBuildRequest.skipBuild'], 'Yes')))
+            pool:
+              ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
+                name: SHINE-INT-L
+              ${{ else }}:
+                name: SHINE-OSS-L
+            buildPlatforms:
+              - ${{ platform }}
+            buildConfigurations: [Release]
+            enablePackageCaching: true
+            enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+            runTests: ${{ parameters.runTests }}
+
+    - ${{ if eq(parameters.runTests, true) }}:
+      - stage: Test_${{ platform }}
+        displayName: Test ${{ platform }}
+        dependsOn:
+          - Build_${{platform}}
+        jobs:
+          - template: job-test-project.yml
+            parameters:
+              platform: ${{ platform }}
+              configuration: Release

.pipelines/v2/templates/steps-build-installer.yml

@@ -0,0 +1,184 @@
+parameters:
+  - name: versionNumber
+    type: string
+    default: "0.0.1"
+  - name: buildUserInstaller
+    type: boolean
+    default: false
+  - name: codeSign
+    type: boolean
+    default: false
+  - name: signingIdentity
+    type: object
+    default: {}
+  - name: additionalBuildOptions
+    type: string
+    default: ''
+
+steps:
+  - pwsh: |-
+      & git clean -xfd -e *exe -- .\installer\
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Clean installer to reduce cross-contamination
+
+  - pwsh: |-
+      $IsPerUser = $${{ parameters.buildUserInstaller }}
+      $InstallerBuildSlug = "MachineSetup"
+      $InstallerBasename = "PowerToysSetup"
+      If($IsPerUser) {
+        $InstallerBuildSlug = "UserSetup"
+        $InstallerBasename = "PowerToysUserSetup"
+      }
+      $InstallerBasename += "-${{ parameters.versionNumber }}-$(BuildPlatform)"
+      Write-Host "##vso[task.setvariable variable=InstallerBuildSlug]$InstallerBuildSlug"
+      Write-Host "##vso[task.setvariable variable=InstallerRelativePath]$(BuildPlatform)\$(BuildConfiguration)\$InstallerBuildSlug"
+      Write-Host "##vso[task.setvariable variable=InstallerBasename]$InstallerBasename"
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Prepare Installer variables
+
+  # This dll needs to be built and signed before building the MSI.
+  - task: VSBuild@1
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build PowerToysSetupCustomActions
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        /t:PowerToysSetupCustomActions
+        /p:RunBuildEvents=true;PerUser=${{parameters.buildUserInstaller}};RestorePackagesConfig=true;CIBuild=true
+        -restore -graph
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-actions.binlog
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: true
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign PowerToysSetupCustomActions
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'installer/PowerToysSetupCustomActions/$(InstallerRelativePath)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+  ## INSTALLER START
+  #### MSI BUILDING AND SIGNING
+  - task: VSBuild@1
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build MSI
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        -restore
+        /t:PowerToysInstaller
+        /p:RunBuildEvents=false;PerUser=${{parameters.buildUserInstaller}};BuildProjectReferences=false;CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-msi.binlog
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: false # don't undo our hard work above by deleting the CustomActions dll
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  - script: |-
+      "C:\Program Files (x86)\WiX Toolset v3.14\bin\dark.exe" -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetup\$(InstallerRelativePath)\$(InstallerBasename).msi
+      dir $(build.sourcesdirectory)\extractedMsi
+    displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Extract and verify MSI"
+
+  # Check if deps.json files don't reference different dll versions.
+  - pwsh: |-
+      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Audit deps.json in MSI extracted files
+
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - pwsh: |-
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\Binary'
+        git clean -xfd ./extractedMsi
+      displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Verify all binaries are signed and versioned
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign MSI
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'installer/PowerToysSetup/$(InstallerRelativePath)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+
+  #### END MSI
+  #### BOOTSTRAP BUILDING AND SIGNING
+
+  - task: VSBuild@1
+    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build Bootstrapper
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        /t:PowerToysBootstrapper
+        /p:PerUser=${{parameters.buildUserInstaller}};CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-bootstrapper.binlog
+        -restore -graph
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: false # don't undo our hard work above by deleting the MSI
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  # The entirety of bundle unpacking/re-packing is unnecessary if we are not code signing it.
+  - ${{ if eq(parameters.codeSign, true) }}:
+    - script: |-
+        "C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ib installer\PowerToysSetup\$(InstallerRelativePath)\$(InstallerBasename).exe -o installer\engine.exe
+      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Insignia: Extract Engine from Bundle"
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign WiX Engine
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: "installer"
+          Pattern: engine.exe
+          signConfigType: inlineSignParams
+          inlineOperation: |
+            [
+                {
+                    "KeyCode": "CP-230012",
+                    "OperationCode": "SigntoolSign",
+                    "Parameters": {
+                        "OpusName": "Microsoft",
+                        "OpusInfo": "http://www.microsoft.com",
+                        "FileDigest": "/fd \"SHA256\"",
+                        "PageHash": "/NPH",
+                        "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+                    },
+                    "ToolName": "sign",
+                    "ToolVersion": "1.0"
+                },
+                {
+                    "KeyCode": "CP-230012",
+                    "OperationCode": "SigntoolVerify",
+                    "Parameters": {},
+                    "ToolName": "sign",
+                    "ToolVersion": "1.0"
+                }
+            ]
+
+    - script: |-
+        "C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ab installer\engine.exe installer\PowerToysSetup\$(InstallerRelativePath)\$(InstallerBasename).exe -o installer\PowerToysSetup\$(InstallerRelativePath)\$(InstallerBasename).exe
+      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Insignia: Merge Engine into Bundle"
+
+    - template: steps-esrp-signing.yml
+      parameters:
+        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign Final Bootstrapper
+        signingIdentity: ${{ parameters.signingIdentity }}
+        inputs:
+          FolderPath: 'installer/PowerToysSetup/$(InstallerRelativePath)'
+          signType: batchSigning
+          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
+          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+  #### END BOOTSTRAP
+  ## END INSTALLER

.pipelines/v2/templates/steps-ensure-dotnet-version.yml

@@ -0,0 +1,27 @@
+parameters:
+- name: version
+  type: string
+  default: "8.0"
+- name: sdk
+  type: boolean
+  default: false
+
+# You might be wondering, "Why didn't they use UseDotNet?"
+# Azure Pipelines is practically unmaintained, that's why.
+#
+# "[BUG]: UseDotNet task installs x86 build on Windows arm64"
+# https://github.com/microsoft/azure-pipelines-tasks/issues/20300
+#
+# Herein we replicate 90% of the meaningful logic in that task.
+steps:
+- pwsh: |-
+    curl.exe -J -L -O "https://dot.net/v1/dotnet-install.ps1"
+    $NEW_DOTNET_ROOT = "$(Agent.ToolsDirectory)\dotnet"
+    & ./dotnet-install.ps1 -Channel "${{parameters.version}}" -InstallDir $NEW_DOTNET_ROOT
+    Write-Host "##vso[task.setvariable variable=DOTNET_ROOT]${NEW_DOTNET_ROOT}"
+    Write-Host "##vso[task.prependpath]${NEW_DOTNET_ROOT}"
+    Remove-Item dotnet-install.ps1 -ErrorAction:Ignore
+  ${{ if eq(parameters.sdk, true) }}:
+    displayName: "Install .NET ${{parameters.version}} SDK"
+  ${{ else }}:
+    displayName: "Install .NET ${{parameters.version}}"

.pipelines/v2/templates/steps-ensure-nuget-version.yml

@@ -0,0 +1,5 @@
+steps:
+- task: NuGetToolInstaller@1
+  displayName: Use NuGet 6.6.1
+  inputs:
+    versionSpec: 6.6.1

.pipelines/v2/templates/steps-esrp-signing.yml

@@ -0,0 +1,22 @@
+parameters:
+  - name: displayName
+    type: string
+    default: ESRP Code Signing
+  - name: inputs
+    type: object
+    default: {}
+  - name: signingIdentity
+    type: object
+    default: {}
+
+steps:
+  - task: EsrpCodeSigning@5
+    displayName: 🔏 ${{ parameters.displayName }}
+    inputs:
+      ConnectedServiceName: ${{ parameters.signingIdentity.serviceName }}
+      AppRegistrationClientId: ${{ parameters.signingIdentity.appId }}
+      AppRegistrationTenantId: ${{ parameters.signingIdentity.tenantId }}
+      AuthAKVName: ${{ parameters.signingIdentity.akvName }}
+      AuthCertName: ${{ parameters.signingIdentity.authCertName }}
+      AuthSignCertName: ${{ parameters.signingIdentity.signCertName }}
+      ${{ insert }}: ${{ parameters.inputs }}

.pipelines/v2/templates/steps-fetch-and-prepare-localizations.yml

@@ -0,0 +1,26 @@
+parameters:
+  - name: includePseudoLoc
+    type: boolean
+    default: false
+
+steps:
+  - task: TouchdownBuildTask@3
+    displayName: 'Download Localization Files -- PowerToys 37400'
+    inputs:
+      teamId: 37400
+      TDBuildServiceConnection: $(TouchdownServiceConnection)
+      authType: SubjectNameIssuer
+      resourceFilePath: |
+       **\Resources.resx
+       **\Resource.resx
+       **\Resources.resw
+      appendRelativeDir: true
+      localizationTarget: false
+      ${{ if eq(parameters.includePseudoLoc, true) }}:
+        pseudoSetting: Included
+
+  - pwsh: |-
+      $VerbosePreference = "Continue"
+      ./tools/build/move-and-rename-resx.ps1
+      ./tools/build/move-uwp-resw.ps1
+    displayName: Move Loc files into final locations

.pipelines/v2/templates/steps-restore-nuget.yml

@@ -0,0 +1,20 @@
+steps:
+- template: steps-ensure-nuget-version.yml
+
+- task: NuGetAuthenticate@1
+
+- script: |-
+    echo ##vso[task.setvariable variable=NUGET_RESTORE_MSBUILD_ARGS]/p:Platform=$(BuildPlatform)
+  displayName: Ensure NuGet restores for $(BuildPlatform)
+  condition: and(succeeded(), ne(variables['BuildPlatform'], 'Any CPU'))
+
+# In the Microsoft Azure DevOps tenant, NuGetCommand is ambiguous.
+# This should be `task: NuGetCommand@2`
+- task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2
+  displayName: Restore NuGet packages
+  inputs:
+    command: restore
+    feedsToUse: config
+    configPath: NuGet.config
+    restoreSolution: packages.config
+    restoreDirectory: '$(Build.SourcesDirectory)\packages'

.pipelines/verifyDepsJsonLibraryVersions.ps1

@@ -41,7 +41,13 @@ Get-ChildItem $targetDir -Recurse -Filter *.deps.json -Exclude UITests-FancyZone
                             $dllName = Split-Path $_.Name -leaf
                             if([bool]($_.Value.PSObject.Properties.name -match 'fileVersion')) {
                                 $dllFileVersion = $_.Value.fileVersion
-                                
+                                if ([string]::IsNullOrEmpty($dllFileVersion) -and $dllName.StartsWith('PowerToys.'))` {
+                                    # After VS 17.11 update some of PowerToys dlls have no fileVersion in deps.json even though the 
+                                    # version is correctly set. This is a workaround to skip our dlls as we are confident that all of
+                                    # our dlls share the same version across the dependencies.
+                                    continue
+                                }
+
                                 # Add the entry to the dictionary of dictionary of lists
                                 if(-Not $referencedFileVersionsPerDll.ContainsKey($dllName)) {
                                     $referencedFileVersionsPerDll[$dllName] = @{ $dllFileVersion = New-Object System.Collections.Generic.List[System.String] }

.pipelines/versionSetting.ps1

@@ -58,3 +58,21 @@ $imageResizerContextMenuAppManifestReadFileLocation = $imageResizerContextMenuAp
 $imageResizerContextMenuAppManifest.Package.Identity.Version = $versionNumber + '.0'
 Write-Host "ImageResizerContextMenu version" $imageResizerContextMenuAppManifest.Package.Identity.Version
 $imageResizerContextMenuAppManifest.Save($imageResizerContextMenuAppManifestWriteFileLocation);
+
+# Set FileLocksmithContextMenu package version in AppManifest.xml
+$fileLocksmithContextMenuAppManifestWriteFileLocation = $PSScriptRoot + '/../src/modules/FileLocksmith/FileLocksmithContextMenu/AppxManifest.xml';
+$fileLocksmithContextMenuAppManifestReadFileLocation = $fileLocksmithContextMenuAppManifestWriteFileLocation;
+
+[XML]$fileLocksmithContextMenuAppManifest = Get-Content $fileLocksmithContextMenuAppManifestReadFileLocation
+$fileLocksmithContextMenuAppManifest.Package.Identity.Version = $versionNumber + '.0'
+Write-Host "FileLocksmithContextMenu version" $fileLocksmithContextMenuAppManifest.Package.Identity.Version
+$fileLocksmithContextMenuAppManifest.Save($fileLocksmithContextMenuAppManifestWriteFileLocation);
+
+# Set NewPlusContextMenu package version in AppManifest.xml
+$newPlusContextMenuAppManifestWriteFileLocation = $PSScriptRoot + '/../src/modules/NewPlus/NewShellExtensionContextMenu/AppxManifest.xml';
+$newPlusContextMenuAppManifestReadFileLocation = $newPlusContextMenuAppManifestWriteFileLocation;
+
+[XML]$newPlusContextMenuAppManifest = Get-Content $newPlusContextMenuAppManifestReadFileLocation
+$newPlusContextMenuAppManifest.Package.Identity.Version = $versionNumber + '.0'
+Write-Host "NewPlusContextMenu version" $newPlusContextMenuAppManifest.Package.Identity.Version
+$newPlusContextMenuAppManifest.Save($newPlusContextMenuAppManifestWriteFileLocation);

.vsconfig

@@ -7,7 +7,7 @@
     "Microsoft.VisualStudio.Workload.ManagedDesktop",
     "Microsoft.VisualStudio.Workload.Universal",
     "Microsoft.VisualStudio.Component.Windows10SDK.19041",
-    "Microsoft.VisualStudio.Component.Windows10SDK.20348",
+    "Microsoft.VisualStudio.Component.Windows10SDK.22621",
     "Microsoft.VisualStudio.ComponentGroup.UWP.VC",
     "Microsoft.VisualStudio.Component.UWP.VC.ARM64",
     "Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre",

Cpp.Build.props

@@ -33,6 +33,7 @@
     <PreferredToolArchitecture>x64</PreferredToolArchitecture>
     <PreferredToolArchitecture Condition="'$(PROCESSOR_ARCHITECTURE)' == 'ARM64' or '$(PROCESSOR_ARCHITEW6432)' == 'ARM64'">arm64</PreferredToolArchitecture>
     <VcpkgEnabled>false</VcpkgEnabled>
+    <ReplaceWildcardsInProjectItems>true</ReplaceWildcardsInProjectItems>
     <ExternalIncludePath>$(MSBuildThisFileFullPath)\..\deps\;$(MSBuildThisFileFullPath)\..\packages\;$(ExternalIncludePath)</ExternalIncludePath>
     <!-- Enable control flow guard for C++ projects that don't consume any C++ files -->
     <!-- This covers the case where a .dll exports a .lib, but doesn't have any ClCompile entries. -->
@@ -93,17 +94,16 @@
     </Link>
   </ItemDefinitionGroup>
 
-  <!-- Global props -->
-  <PropertyGroup Label="Globals"
-    Condition="'$(OverrideWindowsTargetPlatformVersion)'!='True'">
-    <WindowsTargetPlatformVersion>10.0.20348.0</WindowsTargetPlatformVersion>
-    <TargetPlatformVersion>10.0.20348.0</TargetPlatformVersion>
+  <!-- Global props OverrideWindowsTargetPlatformVersion-->
+  <PropertyGroup Label="Globals">
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.19041.0</WindowsTargetPlatformMinVersion>
   </PropertyGroup>
 
   <!-- Props that are constant for both Debug and Release configurations -->
   <PropertyGroup Label="Configuration">
-    <PlatformToolset Condition="'$(OverridePlatformToolset)'!='True'">v143</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <DesktopCompatible>true</DesktopCompatible>
     <SpectreMitigation>Spectre</SpectreMitigation>

Directory.Build.props

@@ -1,27 +1,28 @@
 <Project>
-
+  <Import Project="src\Version.props" />
   <PropertyGroup>
     <Copyright>Copyright (C) Microsoft Corporation. All rights reserved.</Copyright>
-    <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
     <AssemblyCopyright>Copyright (C) Microsoft Corporation. All rights reserved.</AssemblyCopyright>
     <AssemblyProduct>PowerToys</AssemblyProduct>
+    <AssemblyCompany>Microsoft Corp.</AssemblyCompany>
     <Company>Microsoft Corporation</Company>
+    <Authors>Microsoft Corporation</Authors>
+    <Product>PowerToys</Product>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Platforms>x64;ARM64</Platforms>
     <PackageTags>PowerToys</PackageTags>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisMode>Recommended</AnalysisMode>
     <_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
-    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion> <!-- Don't add source revision hash to the product version of binaries. -->
+    <NuGetAuditMode>direct</NuGetAuditMode>
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>    <!-- Don't add source revision hash to the product version of binaries. -->
     <PlatformTarget>$(Platform)</PlatformTarget>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
+    <Version>$(Version).0</Version>
     <RepositoryUrl>https://github.com/microsoft/PowerToys</RepositoryUrl>
     <RepositoryType>GitHub</RepositoryType>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
@@ -34,7 +35,7 @@
     <PackageReference Include="StyleCop.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference> 
+    </PackageReference>
     <Compile Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\StyleCop.json" Link="StyleCop.json" />
 
@@ -85,7 +86,7 @@
     <UsePrecompiledHeaders Condition="'$(TF_BUILD)' != ''">false</UsePrecompiledHeaders>
 
     <!-- Change this to bust the cache -->
-    <MSBuildCacheCacheUniverse Condition="'$(MSBuildCacheCacheUniverse)' == ''">202407100737</MSBuildCacheCacheUniverse>
+    <MSBuildCacheCacheUniverse Condition="'$(MSBuildCacheCacheUniverse)' == ''">202408150737</MSBuildCacheCacheUniverse>
 
     <!--
       Visual Studio telemetry reads various ApplicationInsights.config files and other files after the project is finished, likely in a detached process.

Directory.Packages.props

@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
@@ -6,55 +6,51 @@
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
     <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.12" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.0.240109" />
-    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Collections" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.1.240821" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.1.240821" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
     <PackageVersion Include="ControlzEx" Version="6.0.0" />
-    <PackageVersion Include="coverlet.collector" Version="1.3.0" />
-    <PackageVersion Include="DotNetSeleniumExtras.WaitHelpers" Version="3.11.0" />
     <PackageVersion Include="HelixToolkit" Version="2.24.0" />
     <PackageVersion Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
-    <PackageVersion Include="HtmlAgilityPack" Version="1.11.57" />
     <PackageVersion Include="hyjiacan.pinyin4net" Version="4.1.1" />
     <PackageVersion Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0.2" />
     <PackageVersion Include="LazyCache" Version="2.4.0" />
     <PackageVersion Include="Mages" Version="2.0.2" />
     <PackageVersion Include="Markdig.Signed" Version="0.34.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.7" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2365.46" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
     <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.7" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
     <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
-    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.0.4" />
+    <!-- 
+      TODO: in Common.Dotnet.CsWinRT.props, on upgrade, verify RemoveCsWinRTPackageAnalyzer is no longer needed.  
+      This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
+	-->
+    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.1.1" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.5.240428000" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.6.240829007" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
     <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
     <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="MSTest.TestAdapter" Version="3.2.0" />
-    <PackageVersion Include="MSTest.TestFramework" Version="3.2.0" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageVersion Include="MSTest" Version="3.5.0" />
     <PackageVersion Include="NLog" Version="5.0.4" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageVersion Include="NLog.Schema" Version="5.2.8" />
@@ -79,17 +75,16 @@
     <PackageVersion Include="System.IO.Abstractions" Version="17.2.3" />
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="17.2.3" />
     <PackageVersion Include="System.Management" Version="8.0.0" />
-    <PackageVersion Include="System.Reactive" Version="6.0.0-preview.9" />
+    <PackageVersion Include="System.Reactive" Version="6.0.1" />
     <PackageVersion Include="System.Runtime.Caching" Version="8.0.0" />
     <!-- Package System.Security.Cryptography.ProtectedData added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
     <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
     <PackageVersion Include="System.ServiceProcess.ServiceController" Version="8.0.0" />
     <PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.4" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
-    <PackageVersion Include="UnitsNet" Version="5.50.0" />
+    <PackageVersion Include="UnitsNet" Version="5.56.0" />
     <PackageVersion Include="UTF.Unknown" Version="2.5.1" />
-    <PackageVersion Include="Vanara.PInvoke.User32" Version="3.4.11" />
-    <PackageVersion Include="Vanara.PInvoke.Shell32" Version="3.4.11" />
     <PackageVersion Include="WinUIEx" Version="2.2.0" />
     <PackageVersion Include="WPF-UI" Version="3.0.0" />
   </ItemGroup>
@@ -98,4 +93,4 @@
     <PackageVersion Include="Microsoft.VariantAssignment.Client" Version="2.4.17140001" />
     <PackageVersion Include="Microsoft.VariantAssignment.Contract" Version="3.0.16990001" />
   </ItemGroup>
-</Project>
+</Project>

NOTICE.md

@@ -1299,14 +1299,14 @@ EXHIBIT A -Mozilla Public License.
 - Appium.WebDriver 4.4.5
 - Azure.AI.OpenAI 1.0.0-beta.12
 - CommunityToolkit.Mvvm 8.2.2
-- CommunityToolkit.WinUI.Animations 8.0.240109
-- CommunityToolkit.WinUI.Collections 8.0.240109
-- CommunityToolkit.WinUI.Controls.Primitives 8.0.240109
-- CommunityToolkit.WinUI.Controls.Segmented 8.0.240109
-- CommunityToolkit.WinUI.Controls.SettingsControls 8.0.240109
-- CommunityToolkit.WinUI.Controls.Sizers 8.0.240109
-- CommunityToolkit.WinUI.Converters 8.0.240109
-- CommunityToolkit.WinUI.Extensions 8.0.240109
+- CommunityToolkit.WinUI.Animations 8.1.240821
+- CommunityToolkit.WinUI.Collections 8.1.240821
+- CommunityToolkit.WinUI.Controls.Primitives 8.1.240821
+- CommunityToolkit.WinUI.Controls.Segmented 8.1.240821
+- CommunityToolkit.WinUI.Controls.SettingsControls 8.1.240821
+- CommunityToolkit.WinUI.Controls.Sizers 8.1.240821
+- CommunityToolkit.WinUI.Converters 8.1.240821
+- CommunityToolkit.WinUI.Extensions 8.1.240821
 - CommunityToolkit.WinUI.UI.Controls.DataGrid 7.1.2
 - CommunityToolkit.WinUI.UI.Controls.Markdown 7.1.2
 - ControlzEx 6.0.0
@@ -1318,28 +1318,25 @@ EXHIBIT A -Mozilla Public License.
 - Mages 2.0.2
 - Markdig.Signed 0.34.0
 - Microsoft.CodeAnalysis.NetAnalyzers 8.0.0
-- Microsoft.Data.Sqlite 8.0.0
+- Microsoft.Data.Sqlite 8.0.7
 - Microsoft.Extensions.DependencyInjection 8.0.0
 - Microsoft.Extensions.Hosting 8.0.0
 - Microsoft.Extensions.Hosting.WindowsServices 8.0.0
 - Microsoft.Extensions.Logging 8.0.0
 - Microsoft.Extensions.Logging.Abstractions 8.0.0
-- Microsoft.NET.Test.Sdk 17.8.0
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
-- Microsoft.Web.WebView2 1.0.2365.46
+- Microsoft.Web.WebView2 1.0.2739.15
 - Microsoft.Win32.SystemEvents 8.0.0
-- Microsoft.Windows.Compatibility 8.0.1
+- Microsoft.Windows.Compatibility 8.0.7
 - Microsoft.Windows.CsWin32 0.2.46-beta
-- Microsoft.Windows.CsWinRT 2.0.4
+- Microsoft.Windows.CsWinRT 2.1.1
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
-- Microsoft.Windows.SDK.Contracts 10.0.19041.1
-- Microsoft.WindowsAppSDK 1.5.240428000
+- Microsoft.WindowsAppSDK 1.6.240829007
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39
 - ModernWpfUI 0.9.4
 - Moq 4.18.4
-- MSTest.TestAdapter 3.2.0
-- MSTest.TestFramework 3.2.0
+- MSTest 3.5.0
 - NLog.Extensions.Logging 5.3.8
 - NLog.Schema 5.2.8
 - ReverseMarkdown 4.1.0
@@ -1359,15 +1356,14 @@ EXHIBIT A -Mozilla Public License.
 - System.IO.Abstractions 17.2.3
 - System.IO.Abstractions.TestingHelpers 17.2.3
 - System.Management 8.0.0
-- System.Reactive 6.0.0-preview.9
+- System.Reactive 6.0.1
 - System.Runtime.Caching 8.0.0
 - System.Security.Cryptography.ProtectedData 8.0.0
 - System.ServiceProcess.ServiceController 8.0.0
 - System.Text.Encoding.CodePages 8.0.0
+- System.Text.Json 8.0.4
 - UnicodeInformation 2.6.0
-- UnitsNet 5.50.0
+- UnitsNet 5.56.0
 - UTF.Unknown 2.5.1
-- Vanara.PInvoke.Shell32 3.4.11
-- Vanara.PInvoke.User32 3.4.11
 - WinUIEx 2.2.0
 - WPF-UI 3.0.0

PowerToys.sln

@@ -171,19 +171,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		src\.editorconfig = src\.editorconfig
 		.vsconfig = .vsconfig
+		src\Common.Dotnet.CsWinRT.props = src\Common.Dotnet.CsWinRT.props
+		src\Common.SelfContained.props = src\Common.SelfContained.props
+		Cpp.Build.props = Cpp.Build.props
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		Directory.Packages.props = Directory.Packages.props
 		Solution.props = Solution.props
+		src\Version.props = src\Version.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Settings.UI.Library", "src\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj", "{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerToys.Interop", "src\common\interop\PowerToys.Interop.vcxproj", "{F055103B-F80B-4D0C-BF48-057C55620033}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF} = {CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Folder", "src\modules\launcher\Plugins\Microsoft.Plugin.Folder\Microsoft.Plugin.Folder.csproj", "{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerLauncher.Telemetry", "src\modules\launcher\PowerLauncher.Telemetry\PowerLauncher.Telemetry.csproj", "{08C8C05F-0362-41BC-818C-724572DF8B06}"
@@ -274,10 +273,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{B39DC643
 		src\common\utils\HDropIterator.h = src\common\utils\HDropIterator.h
 		src\common\utils\HttpClient.h = src\common\utils\HttpClient.h
 		src\common\utils\json.h = src\common\utils\json.h
+		src\common\utils\language_helper.h = src\common\utils\language_helper.h
 		src\common\utils\logger_helper.h = src\common\utils\logger_helper.h
 		src\common\utils\modulesRegistry.h = src\common\utils\modulesRegistry.h
 		src\common\utils\MsiUtils.h = src\common\utils\MsiUtils.h
 		src\common\utils\MsWindowsSettings.h = src\common\utils\MsWindowsSettings.h
+		src\common\utils\OnThreadExecutor.h = src\common\utils\OnThreadExecutor.h
 		src\common\utils\os-detect.h = src\common\utils\os-detect.h
 		src\common\utils\package.h = src\common\utils\package.h
 		src\common\utils\ProcessWaiter.h = src\common\utils\ProcessWaiter.h
@@ -457,7 +458,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileLocksmithExt", "src\mod
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileLocksmithUI", "src\modules\FileLocksmith\FileLocksmithUI\FileLocksmithUI.csproj", "{E69B044A-2F8A-45AA-AD0B-256C59421807}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileLocksmithLibInterop", "src\modules\FileLocksmith\FileLocksmithLibInterop\FileLocksmithLibInterop.vcxproj", "{C604B37E-9D0E-4484-8778-E8B31B0E1B3A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerToys.FileLocksmithLib.Interop", "src\modules\FileLocksmith\FileLocksmithLibInterop\FileLocksmithLibInterop.vcxproj", "{C604B37E-9D0E-4484-8778-E8B31B0E1B3A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GPOWrapper", "src\common\GPOWrapper\GPOWrapper.vcxproj", "{E599C30B-9DC8-4E5A-BF27-93D4CCEDE788}"
 EndProject
@@ -582,6 +583,45 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerToys.Settings.DSC.Sche
 		{020A7474-3601-4160-A159-D7B70B77B15F} = {020A7474-3601-4160-A159-D7B70B77B15F}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewPlus.ShellExtension", "src\modules\NewPlus\NewShellExtensionContextMenu\NewShellExtensionContextMenu.vcxproj", "{8ACB33D9-C95B-47D4-8363-9731EE0930A0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "New+", "New+", "{CA716AE6-FE5C-40AC-BB8F-2C87912687AC}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerToys.Interop", "src\common\interop\PowerToys.Interop.vcxproj", "{F055103B-F80B-4D0C-BF48-057C55620033}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workspaces", "Workspaces", "{A2221D7E-55E7-4BEA-90D1-4F162D670BBF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workspaces-common", "workspaces-common", "{BE126CBB-AE12-406A-9837-A05ACFCA57A7}"
+	ProjectSection(SolutionItems) = preProject
+		src\modules\Workspaces\workspaces-common\GuidUtils.h = src\modules\Workspaces\workspaces-common\GuidUtils.h
+		src\modules\Workspaces\workspaces-common\InvokePoint.h = src\modules\Workspaces\workspaces-common\InvokePoint.h
+		src\modules\Workspaces\workspaces-common\MonitorEnumerator.h = src\modules\Workspaces\workspaces-common\MonitorEnumerator.h
+		src\modules\Workspaces\workspaces-common\MonitorUtils.h = src\modules\Workspaces\workspaces-common\MonitorUtils.h
+		src\modules\Workspaces\workspaces-common\VirtualDesktop.h = src\modules\Workspaces\workspaces-common\VirtualDesktop.h
+		src\modules\Workspaces\workspaces-common\WindowEnumerator.h = src\modules\Workspaces\workspaces-common\WindowEnumerator.h
+		src\modules\Workspaces\workspaces-common\WindowFilter.h = src\modules\Workspaces\workspaces-common\WindowFilter.h
+		src\modules\Workspaces\workspaces-common\WindowUtils.h = src\modules\Workspaces\workspaces-common\WindowUtils.h
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowProperties", "WindowProperties", "{14CB58B7-D280-4A7A-95DE-4B2DF14EA000}"
+	ProjectSection(SolutionItems) = preProject
+		src\modules\Workspaces\WindowProperties\WorkspacesWindowPropertyUtils.h = src\modules\Workspaces\WindowProperties\WorkspacesWindowPropertyUtils.h
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesLib", "src\modules\Workspaces\WorkspacesLib\WorkspacesLib.vcxproj", "{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkspacesLauncherUI", "src\modules\Workspaces\WorkspacesLauncherUI\WorkspacesLauncherUI.csproj", "{9C53CC25-0623-4569-95BC-B05410675EE3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesModuleInterface", "src\modules\Workspaces\WorkspacesModuleInterface\WorkspacesModuleInterface.vcxproj", "{45285DF2-9742-4ECA-9AC9-58951FC26489}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesSnapshotTool", "src\modules\Workspaces\WorkspacesSnapshotTool\WorkspacesSnapshotTool.vcxproj", "{3D63307B-9D27-44FD-B033-B26F39245B85}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkspacesEditor", "src\modules\Workspaces\WorkspacesEditor\WorkspacesEditor.csproj", "{367D7543-7DBA-4381-99F1-BF6142A996C4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesLauncher", "src\modules\Workspaces\WorkspacesLauncher\WorkspacesLauncher.vcxproj", "{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesWindowArranger", "src\modules\Workspaces\WorkspacesWindowArranger\WorkspacesWindowArranger.vcxproj", "{37D07516-4185-43A4-924F-3C7A5D95ECF6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -952,16 +992,6 @@ Global
 		{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}.Release|x64.ActiveCfg = Release|x64
 		{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}.Release|x64.Build.0 = Release|x64
 		{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}.Release|x86.ActiveCfg = Release|x64
-		{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|ARM64.Build.0 = Debug|ARM64
-		{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|x64.ActiveCfg = Debug|x64
-		{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|x64.Build.0 = Debug|x64
-		{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|x86.ActiveCfg = Debug|x64
-		{F055103B-F80B-4D0C-BF48-057C55620033}.Release|ARM64.ActiveCfg = Release|ARM64
-		{F055103B-F80B-4D0C-BF48-057C55620033}.Release|ARM64.Build.0 = Release|ARM64
-		{F055103B-F80B-4D0C-BF48-057C55620033}.Release|x64.ActiveCfg = Release|x64
-		{F055103B-F80B-4D0C-BF48-057C55620033}.Release|x64.Build.0 = Release|x64
-		{F055103B-F80B-4D0C-BF48-057C55620033}.Release|x86.ActiveCfg = Release|x64
 		{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Debug|ARM64.Build.0 = Debug|ARM64
 		{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Debug|x64.ActiveCfg = Debug|x64
@@ -2598,6 +2628,112 @@ Global
 		{1D6893CB-BC0C-46A8-A76C-9728706CA51A}.Release|x64.Build.0 = Release|x64
 		{1D6893CB-BC0C-46A8-A76C-9728706CA51A}.Release|x86.ActiveCfg = Release|x64
 		{1D6893CB-BC0C-46A8-A76C-9728706CA51A}.Release|x86.Build.0 = Release|x64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|ARM64.Build.0 = Debug|ARM64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|x64.ActiveCfg = Debug|x64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|x64.Build.0 = Debug|x64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Debug|x86.ActiveCfg = Debug|x64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|ARM64.ActiveCfg = Release|ARM64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|ARM64.Build.0 = Release|ARM64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|x64.ActiveCfg = Release|x64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|x64.Build.0 = Release|x64
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0}.Release|x86.ActiveCfg = Release|x64
+		{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|ARM64.Build.0 = Debug|ARM64
+		{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|x64.ActiveCfg = Debug|x64
+		{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|x64.Build.0 = Debug|x64
+		{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|x86.ActiveCfg = Debug|x64
+		{F055103B-F80B-4D0C-BF48-057C55620033}.Debug|x86.Build.0 = Debug|x64
+		{F055103B-F80B-4D0C-BF48-057C55620033}.Release|ARM64.ActiveCfg = Release|ARM64
+		{F055103B-F80B-4D0C-BF48-057C55620033}.Release|ARM64.Build.0 = Release|ARM64
+		{F055103B-F80B-4D0C-BF48-057C55620033}.Release|x64.ActiveCfg = Release|x64
+		{F055103B-F80B-4D0C-BF48-057C55620033}.Release|x64.Build.0 = Release|x64
+		{F055103B-F80B-4D0C-BF48-057C55620033}.Release|x86.ActiveCfg = Release|x64
+		{F055103B-F80B-4D0C-BF48-057C55620033}.Release|x86.Build.0 = Release|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Debug|ARM64.Build.0 = Debug|ARM64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Debug|x64.ActiveCfg = Debug|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Debug|x64.Build.0 = Debug|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Debug|x86.ActiveCfg = Debug|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Debug|x86.Build.0 = Debug|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|ARM64.Build.0 = Release|ARM64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|x64.ActiveCfg = Release|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|x64.Build.0 = Release|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|x86.ActiveCfg = Release|x64
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332}.Release|x86.Build.0 = Release|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|ARM64.Build.0 = Debug|ARM64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|x64.ActiveCfg = Debug|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|x64.Build.0 = Debug|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|x86.ActiveCfg = Debug|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Debug|x86.Build.0 = Debug|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Release|ARM64.ActiveCfg = Release|ARM64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Release|ARM64.Build.0 = Release|ARM64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Release|x64.ActiveCfg = Release|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Release|x64.Build.0 = Release|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Release|x86.ActiveCfg = Release|x64
+		{9C53CC25-0623-4569-95BC-B05410675EE3}.Release|x86.Build.0 = Release|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Debug|ARM64.Build.0 = Debug|ARM64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Debug|x64.ActiveCfg = Debug|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Debug|x64.Build.0 = Debug|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Debug|x86.ActiveCfg = Debug|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Debug|x86.Build.0 = Debug|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Release|ARM64.ActiveCfg = Release|ARM64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Release|ARM64.Build.0 = Release|ARM64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Release|x64.ActiveCfg = Release|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Release|x64.Build.0 = Release|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Release|x86.ActiveCfg = Release|x64
+		{45285DF2-9742-4ECA-9AC9-58951FC26489}.Release|x86.Build.0 = Release|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Debug|ARM64.Build.0 = Debug|ARM64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Debug|x64.ActiveCfg = Debug|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Debug|x64.Build.0 = Debug|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Debug|x86.ActiveCfg = Debug|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Debug|x86.Build.0 = Debug|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Release|ARM64.ActiveCfg = Release|ARM64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Release|ARM64.Build.0 = Release|ARM64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Release|x64.ActiveCfg = Release|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Release|x64.Build.0 = Release|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Release|x86.ActiveCfg = Release|x64
+		{3D63307B-9D27-44FD-B033-B26F39245B85}.Release|x86.Build.0 = Release|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Debug|ARM64.Build.0 = Debug|ARM64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Debug|x64.ActiveCfg = Debug|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Debug|x64.Build.0 = Debug|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Debug|x86.ActiveCfg = Debug|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Debug|x86.Build.0 = Debug|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Release|ARM64.ActiveCfg = Release|ARM64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Release|ARM64.Build.0 = Release|ARM64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Release|x64.ActiveCfg = Release|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Release|x64.Build.0 = Release|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Release|x86.ActiveCfg = Release|x64
+		{367D7543-7DBA-4381-99F1-BF6142A996C4}.Release|x86.Build.0 = Release|x64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Debug|ARM64.Build.0 = Debug|ARM64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Debug|x64.ActiveCfg = Debug|x64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Debug|x64.Build.0 = Debug|x64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Debug|x86.ActiveCfg = Debug|x64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Debug|x86.Build.0 = Debug|x64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Release|ARM64.ActiveCfg = Release|ARM64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Release|ARM64.Build.0 = Release|ARM64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Release|x64.ActiveCfg = Release|x64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Release|x64.Build.0 = Release|x64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Release|x86.ActiveCfg = Release|x64
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96}.Release|x86.Build.0 = Release|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Debug|ARM64.Build.0 = Debug|ARM64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Debug|x64.ActiveCfg = Debug|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Debug|x64.Build.0 = Debug|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Debug|x86.ActiveCfg = Debug|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Debug|x86.Build.0 = Debug|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Release|ARM64.ActiveCfg = Release|ARM64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Release|ARM64.Build.0 = Release|ARM64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Release|x64.ActiveCfg = Release|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Release|x64.Build.0 = Release|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Release|x86.ActiveCfg = Release|x64
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Release|x86.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2644,7 +2780,6 @@ Global
 		{748417CA-F17E-487F-9411-CAFB6D3F4877} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{217DF501-135C-4E38-BFC8-99D4821032EA} = {2F305555-C296-497E-AC20-5FA1B237996A}
 		{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
-		{F055103B-F80B-4D0C-BF48-057C55620033} = {5A7818A8-109C-4E1C-850D-1A654E234B0E}
 		{787B8AA6-CA93-4C84-96FE-DF31110AD1C4} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
 		{08C8C05F-0362-41BC-818C-724572DF8B06} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
 		{5D00D290-4016-4CFE-9E41-1E7C724509BA} = {1AFB6476-670D-4E80-A464-657E01DFF482}
@@ -2814,6 +2949,19 @@ Global
 		{3A9A791E-94A9-49F8-8401-C11CE288D5FB} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{C0974915-8A1D-4BF0-977B-9587D3807AB7} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{1D6893CB-BC0C-46A8-A76C-9728706CA51A} = {557C4636-D7E1-4838-A504-7D19B725EE95}
+		{8ACB33D9-C95B-47D4-8363-9731EE0930A0} = {CA716AE6-FE5C-40AC-BB8F-2C87912687AC}
+		{CA716AE6-FE5C-40AC-BB8F-2C87912687AC} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
+		{F055103B-F80B-4D0C-BF48-057C55620033} = {5A7818A8-109C-4E1C-850D-1A654E234B0E}
+		{A2221D7E-55E7-4BEA-90D1-4F162D670BBF} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
+		{BE126CBB-AE12-406A-9837-A05ACFCA57A7} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{14CB58B7-D280-4A7A-95DE-4B2DF14EA000} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{B31FCC55-B5A4-4EA7-B414-2DCEAE6AF332} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{9C53CC25-0623-4569-95BC-B05410675EE3} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{45285DF2-9742-4ECA-9AC9-58951FC26489} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{3D63307B-9D27-44FD-B033-B26F39245B85} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{367D7543-7DBA-4381-99F1-BF6142A996C4} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
+		{37D07516-4185-43A4-924F-3C7A5D95ECF6} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

README.md

@@ -8,8 +8,8 @@
 
 | Architecture | Solution (Main) | Solution (Stable) | Installer (Main) |
 |--------------|-----------------|-------------------|------------------|
-| x64 | [![Build Status for Main](https://dev.azure.com/ms/PowerToys/_apis/build/status/microsoft.PowerToys?branchName=main&jobName=Build%20x64%20Release)](https://dev.azure.com/ms/PowerToys/_build/latest?definitionId=219&branchName=main&jobName=Build%20x64%20Release) | [![Build Status for Stable](https://dev.azure.com/ms/PowerToys/_apis/build/status/microsoft.PowerToys?branchName=stable&jobName=Build%20x64%20Release)](https://dev.azure.com/ms/PowerToys/_build/latest?definitionId=219&branchName=stable) | [![Build Status Installer pipeline](https://dev.azure.com/microsoft/Dart/_apis/build/status/PowerToys/PowerToys%20Signed%20YAML%20Release%20Build?branchName=main&jobName=Build&configuration=Build%20Release_x64)](https://dev.azure.com/microsoft/Dart/_build/latest?definitionId=76541&branchName=main) |
-| ARM64 | [![Build Status for Main](https://dev.azure.com/ms/PowerToys/_apis/build/status/microsoft.PowerToys?branchName=main&jobName=Build%20arm64%20Release)](https://dev.azure.com/ms/PowerToys/_build/latest?definitionId=219&branchName=main) | [![Build Status for Main](https://dev.azure.com/ms/PowerToys/_apis/build/status/microsoft.PowerToys?branchName=main&jobName=Build%20arm64%20Release)](https://dev.azure.com/ms/PowerToys/_build/latest?definitionId=219&branchName=stable) | [![Build Status Installer pipeline](https://dev.azure.com/microsoft/Dart/_apis/build/status/PowerToys/PowerToys%20Signed%20YAML%20Release%20Build?branchName=main&jobName=Build&configuration=Build%20Release_arm64)](https://dev.azure.com/microsoft/Dart/_build/latest?definitionId=76541&branchName=main) |
+| x64 | [![Build Status for Main](https://dev.azure.com/shine-oss/PowerToys/_apis/build/status%2FPowerToys%20CI?branchName=main&jobName=Build%20x64%20Release)](https://dev.azure.com/shine-oss/PowerToys/_build/latest?definitionId=3&branchName=main) | [![Build Status for Stable](https://dev.azure.com/shine-oss/PowerToys/_apis/build/status%2FPowerToys%20CI?branchName=stable&jobName=Build%20x64%20Release)](https://dev.azure.com/shine-oss/PowerToys/_build/latest?definitionId=3&branchName=stable) | [![Build Status Installer pipeline](https://dev.azure.com/microsoft/Dart/_apis/build/status/PowerToys/PowerToys%20Signed%20YAML%20Release%20Build?branchName=main&jobName=Build&configuration=Build%20Release_x64)](https://dev.azure.com/microsoft/Dart/_build/latest?definitionId=76541&branchName=main) |
+| ARM64 | [![Build Status for Main](https://dev.azure.com/shine-oss/PowerToys/_apis/build/status%2FPowerToys%20CI?branchName=main&jobName=Build%20arm64%20Release)](https://dev.azure.com/shine-oss/PowerToys/_build/latest?definitionId=3&branchName=main) | [![Build Status for Stable](https://dev.azure.com/shine-oss/PowerToys/_apis/build/status%2FPowerToys%20CI?branchName=main&jobName=Build%20arm64%20Release)](https://dev.azure.com/shine-oss/PowerToys/_build/latest?definitionId=3&branchName=main) | [![Build Status Installer pipeline](https://dev.azure.com/microsoft/Dart/_apis/build/status/PowerToys/PowerToys%20Signed%20YAML%20Release%20Build?branchName=main&jobName=Build&configuration=Build%20Release_arm64)](https://dev.azure.com/microsoft/Dart/_build/latest?definitionId=76541&branchName=main) |
 
 ## About
 
@@ -22,10 +22,10 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 | [Environment Variables](https://aka.ms/PowerToysOverview_EnvironmentVariables) | [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) | [File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) |
 | [File Locksmith](https://aka.ms/PowerToysOverview_FileLocksmith) | [Hosts File Editor](https://aka.ms/PowerToysOverview_HostsFileEditor) | [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) |
 | [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [Mouse utilities](https://aka.ms/PowerToysOverview_MouseUtilities) | [Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) |
-| [Peek](https://aka.ms/PowerToysOverview_Peek) | [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) | [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) |
-| [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) | [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) | [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) |
-| [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) | [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) | [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) |
-| [Video Conference Mute](https://aka.ms/PowerToysOverview_VideoConference) |
+| [New+](https://aka.ms/PowerToysOverview_NewPlus) | [Peek](https://aka.ms/PowerToysOverview_Peek) | [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) |
+| [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) | [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) |
+| [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) | [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) |
+| [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [Video Conference Mute](https://aka.ms/PowerToysOverview_VideoConference) | [Workspaces](https://aka.ms/PowerToysOverview_Workspaces) |
 
 ## Installing and running Microsoft PowerToys
 
@@ -41,19 +41,19 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user.
 
 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.83%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.82%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.82.0/PowerToysUserSetup-0.82.0-x64.exe
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.82.0/PowerToysUserSetup-0.82.0-arm64.exe
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.82.0/PowerToysSetup-0.82.0-x64.exe
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.82.0/PowerToysSetup-0.82.0-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.86%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.85%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.85.0/PowerToysUserSetup-0.85.0-x64.exe
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.85.0/PowerToysUserSetup-0.85.0-arm64.exe
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.85.0/PowerToysSetup-0.85.0-x64.exe
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.85.0/PowerToysSetup-0.85.0-arm64.exe
  
 |  Description   | Filename | sha256 hash |
 |----------------|----------|-------------|
-| Per user - x64       | [PowerToysUserSetup-0.82.0-x64.exe][ptUserX64] | 295E2A4622C7E347D3E1BAEA6B36BECC328B566496678F1F87DE3F8A12A7F89A |
-| Per user - ARM64     | [PowerToysUserSetup-0.82.0-arm64.exe][ptUserArm64] | 55D25D068C6148F0A15C7806B9F813224ABA9C461943F42BB2A8B0E22D28240C |
-| Machine wide - x64   | [PowerToysSetup-0.82.0-x64.exe][ptMachineX64] | 01B59C00BB43C25BEFEF274755875717AB4DEAB57C0354AB96CF5B1DA4837C9A |
-| Machine wide - ARM64 | [PowerToysSetup-0.82.0-arm64.exe][ptMachineArm64] | 1F642B50962516127793C4D3556BF4FC24B9738BAC2F362CAA3BFF8B0C3AF97F |
+| Per user - x64       | [PowerToysUserSetup-0.85.0-x64.exe][ptUserX64] | 28A8BEA61040751287FF47C9BAC627A53A4670CFEA0C17B96EE947219E9A6EA9 |
+| Per user - ARM64     | [PowerToysUserSetup-0.85.0-arm64.exe][ptUserArm64] | 2CA077E842B7C53BAFC75A25DBD16C1A4FCE20924C36FDA5AD8CF23CD836B855 |
+| Machine wide - x64   | [PowerToysSetup-0.85.0-x64.exe][ptMachineX64] | 4A248AA914EEE339AA99D467FDFBDB1FCD7A49A8564DDBBB811D0EC69CEBAB75 |
+| Machine wide - ARM64 | [PowerToysSetup-0.85.0-arm64.exe][ptMachineArm64] | B5FB04EAF44C4203E785411FF55025842B9C39D4970C0C934CB8ADBE79EF31AF |
 
 This is our preferred method.
 
@@ -99,136 +99,117 @@ For guidance on developing for PowerToys, please read the [developer docs](/doc/
 
 Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on.
 
-### 0.82 - June 2024 Update
+### 0.85 - September 2024 Update
 
-In this release, we focused on stability and improvements.
+In this release, we focused on new features, stability, and improvements.
 
 **Highlights**
 
- - New feature added to PowerRename to allow using sequences of random characters and UUIDs when renaming files. Thanks [@jhirvioja](https://github.com/jhirvioja)!
- - Improvements in the Paste As JSON feature to better handle other CSV delimiters and converting from ini files. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Fixed UI issues that were reported after upgrading to WPF UI on Color Picker and PowerToys Run.
- - Bug fixes and stability.
+ - New utility: New+ - allows setting a personalized set of templates to quickly create files and folders from a File Explorer context menu. Thanks [@cgaarden](https://github.com/cgaarden)!
+ - Language selection - it's now possible to select which UI language should be used by PowerToys utilities.
+ - Lots of quality fixes for Workspaces, improving the number of supported applications.
+ - Reduced Peek memory usage by fixing image leaks. Thanks [@daverayment](https://github.com/daverayment)!
+
+### General
+
+ - Added a general setting to select which UI language should be used in PowerToys utilities.
+ - Fixed internal code of some policies for Group Policy Objects, that were reading registry entries using the wrong internal functions, and structured code better to avoid future mistakes of the same kind. Thanks [@htcfreek](https://github.com/htcfreek)!
 
 ### Advanced Paste
 
- - Fixed an issue causing external applications triggering Advanced Paste. (This was a hotfix for 0.81)
- - Added a GPO rule to disallow using online models in Advanced Paste. (This was a hotfix for 0.81)
- - Improved CSV delimiter handling and plain text parsing for the Paste as JSON feature. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Added support to convert from ini in the Paste as JSON feature. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Fixed a memory leak caused by images not being properly cleaned out from clipboard history.
- - Added an option to hide the UI when it loses focus. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Improved telemetry to get better data about token usage and if clipboard history is a popular feature. Thanks [@craigloewen-msft](https://github.com/craigloewen-msft)!
+ - Fixed some telemetry calls to signal Advanced Paste activation on the cases where a direct shortcut is being used without showing the UI.
+ - User-defined custom actions can only be used with AI turned on, so custom actions were disabled on Settings when AI is disabled and were hidden from the Advanced Paste UI.
 
-### Color Picker
+### Awake
 
- - Fixed the opaque background corners in the picker that were introduced after the upgrade to WPFUI.
-
-### Developer Files Preview (Monaco)
-
- - Improved the syntax highlight for .gitignore files. Thanks [@PesBandi](https://github.com/PesBandi)!
- - Checking for the sticky scroll option in code behind was being done twice. Removed one of the checks. Thanks [@downarowiczd](https://github.com/downarowiczd)!
+ - Fixed tray icon behaviors, not appearing and showing incorrect time. Thanks [@dend](https://github.com/dend)!
 
 ### Environment Variables Editor
 
- - Added clarity to the UI section tooltips. Thanks [@anson-poon](https://github.com/anson-poon)!
+ - Added the `_NT_SYMBOL_PATH`, `_NT_ALT_SYMBOL_PATH` and `_NT_SYMCACHE_PATH` as variables that are shown as lists. Thanks [@chwarr](https://github.com/chwarr)!
 
-### File Explorer add-ons
+### FancyZones
 
- - Fixed a crash when the preview handlers received a 64-bit handle from the OS. Thanks [@z4pf1sh](https://github.com/z4pf1sh)!
- - Fixed a crash when trying to update window bounds and File Explorer already disposed the preview.
+ - Allow snapping applications that were launched by Workspaces.
 
-### Find My Mouse
+### File Locksmith
 
- - Added the option to have to use the Windows + Control keys to activate. Thanks [@Gentoli](https://github.com/Gentoli)!
+ - Fixed an issue causing File Locksmith to be triggered by unrelated verbs in the context menu.
 
-### Hosts File Editor
+### Mouse Pointer Crosshairs
 
- - Improved spacing definitions in the UI so that hosts name are not hidden when resizing and icons are well aligned. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Changed the additional lines dialog to show the horizontal scrollbar instead of wrapping contents. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Improved the duplication check's logic to improve performance and take into account features that were introduced after it. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Allow crosshairs radius to be 0 pixels. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!
 
-### Installer
+### New+
 
- - Fixed the remaining install failures when the folders the DSC module is to be installed in isn't accessible by the WiX installer for user scope installations.
- - Fixed an issue causing ARM 64 uninstall process to not correctly finding powershell 7 to run uninstall scripts.
+ - New utility - Allows setting a personalized set of templates to quickly create files and folders from a File Explorer context menu. Thanks [@cgaarden](https://github.com/cgaarden)!
+ - Added missing entry for New+ policy state reporting in the Bug Report tool. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added a policy for enabling/disabling whether filename extensions should be shown. Thanks [@htcfreek](https://github.com/htcfreek)!
 
 ### Peek
 
- - Prevent activating Peek when the user is renaming a file. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Added support to preview special folders like Recycle Bin and My PC instead of throwing an error.
- - Fixed a crash caused by double releasing a COM object from the module interface.
-
-### Power Rename
-
- - Improved apostrophe character handling for the Capitalize and Titlecase renaming flags. Thanks [@anthonymonforte](https://github.com/anthonymonforte)!
- - Added a feature to allow using sequences of random characters or UUIDs when renaming files. Thanks [@jhirvioja](https://github.com/jhirvioja)!
+ - Properly show file's modified date instead of creation date in the file previewer. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed memory leak caused by unmanaged bitmap images not being freed. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed an issue causing Peek to not be displayed the first time when using a preview handler to display files. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Prevent tooltip in file previewer from overlapping with title bar controls. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed memory leaks in thumbnails and refactored image previewer. Thanks [@daverayment](https://github.com/daverayment)!
 
 ### PowerToys Run
 
- - Improved the plugin descriptions for consistency in the UI. Thanks [@HydroH](https://github.com/HydroH)!
- - Fixed UI scaling for different dpi scenarios.
- - Fixed crash on a racing condition when updating UWP icon paths in the Program plugin. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Fixed PowerToys Run hanging when trying to close an unresponsive window in the WindowWalker plugin. Thanks [@GhostVaibhav](https://github.com/GhostVaibhav)!
- - Fixed the example in the UnitConverter description to reduce confusion with the inches abbreviation (now uses "to" instead of "in"). Thanks [@acekirkpatrick](https://github.com/acekirkpatrick)!
- - Brought the acrylic background back and applied a proper fix to the titlebar accent showing through transparency.
- - Fixed an issue causing the transparency from the UI disappearing after some time.
+ - Improved the message boxes to be more specific when PowerToys Run failed to initialize itself or any plugin. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Use capital letters when showing degree results in the Unit Converter plugin. Thanks [@PesBandi](https://github.com/PesBandi)!
 
 ### Quick Accent
 
- - Added support for the Crimean Tatar character set. Thanks [@cor-bee](https://github.com/cor-bee)!
- - Added the Numero symbol and double acute accent character. Thanks [@PesBandi](https://github.com/PesBandi)!
- - Added the International Phonetic Alphabet characters. Thanks [@PesBandi](https://github.com/PesBandi)!
- - Fixed the character description center positioning. Thanks [@PesBandi](https://github.com/PesBandi)!
- - Added feminine and masculine ordinal indicator characters to the Portuguese character set. Thanks [@octastylos-pseudodipteros](https://github.com/octastylos-pseudodipteros)!
-
-### Screen Ruler
-
- - Updated the default activation hotkey to Win+Control+Shift+M, in order to not conflict with the Windows shortcut that restores minimized windows (Win+Shift+M). Thanks [@nx-frost](https://github.com/nx-frost)!
+ - Add the Middle Eastern Romanization character set. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Add the degree sign, integral and vertical ellipsis when "All Languages" is selected. Thanks [@rddunphy](https://github.com/rddunphy)!
 
 ### Settings
 
- - Disabled the UI to enable/disable clipboard history in the Advanced Paste settings page when clipboard history is disabled by GPO in the system. (This was a hotfix for 0.81)
- - Updated Advanced Paste's Settings and OOBE page to clarify that the AI use is optional and opt-in. (This was a hotfix for 0.81)
- - Corrected a spelling fix in Advanced Paste's settings page. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Added localization support for the "Configure OpenAI Key" button in Advanced Paste's settings page. Thanks [@zetaloop](https://github.com/zetaloop)!
- - Fixed extra GPO warnings being shown in Advanced Paste's settings page even if the module is disabled. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Fixed a crash when a PowerToys Run plugin icon path is badly formed.
- - Disabled the experimentation paths in code behind to improve performance, since there's no current experimentation going on.
+ - Fixed the link to the Workspaces documentation. (This was a hotfix for 0.84)
+ - Fixed flyout issues after the Windows App SDK upgrade. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed initialization for the New+ settings page. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed enabled state of a control on the New+ settings page if the module is enabled by policy. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Fixed a crash when cancelling the template folder selection in the New+ settings page.
+
+### Workspaces
+
+ - Fixed detecting and snapping applications like Discord. (This was a hotfix for 0.84)
+ - Fixed detecting and snapping applications like Steam. (This was a hotfix for 0.84)
+ - Fixed button visibility in the UI. (This was a hotfix for 0.84)
+ - Fixed an issue launching the wrong project when the editor was closed without saving or cancelling a new project.
+ - Properly handle repositioning windows running as administrator.
+ - Properly handle cases where the monitor where a workspace was saved is no longer present.
+ - Fixed the workspace launcher restarting itself in a loop without success.
+ - Properly handle standalone applications.
+ - Fixed issues causing icons to not show.
 
 ### Documentation
 
- - Adjusted the readme and release notes to clarify use of AI on Advanced Paste. (This was a hotfix for 0.81)
- - Added the Edge Workspaces plugin to PowerToys Run thirdPartyRunPlugins.md docs. Thanks [@quachpas](https://github.com/quachpas)!
- - Removed the deprecated Guid plugin from PowerToys Run thirdPartyRunPlugins.md docs. Thanks [@abduljawada](https://github.com/abduljawada)!
- - Added the PowerHexInspector plugin to PowerToys Run thirdPartyRunPlugins.md docs. Thanks [@NaroZeol](https://github.com/NaroZeol)!
- - Fixed a broken link in the communication-with-modules.md file. Thanks [@PesBandi](https://github.com/PesBandi)! 
- - Updated COMMUNITY.md with missing and former members.
+ - Fixed the thirdPartyRunPlugins.md entry for the RDP plugin. Thanks [@YisroelTech](https://github.com/YisroelTech)! 
 
 ### Development
 
- - Fixed ci UI tests to point to the correct Visual Studio vstest location after a Visual Studio upgrade. (This was a hotfix for 0.81)
- - Updated System.Drawing.Common to 8.0.6 to fix CI builds after the .NET 8.0.6 upgrade was released.
- - Removed an incorrect file reference to long removed documentation from the solution file. Thanks [@Kissaki](https://github.com/Kissaki)!
- - Upgraded Windows App SDK to 1.5.3.
- - Removed use of the BinaryFormatter API from Mouse Without Borders, which is expected to be deprecated in .NET 9.
- - The user scope installer is now sent to the Microsoft store instead of the machine scope installer.
- - Refactored Mouse Jump's internal code to allow for a future introduction of customizable appearance features. Thanks [@mikeclayton](https://github.com/mikeclayton)!
- - Removed a noisy error from spell check ci runs.
- - Improved the ci agent pool selection code.
- - Updated Xamlstyler.console to 3.2404.2. Thanks [@Jvr2022](https://github.com/Jvr2022)!
- - Updated UnitsNet to 5.50.0 Thanks [@Jvr2022](https://github.com/Jvr2022)!
- - Replaced LPINPUT with std::vector of INPUT instances in Keyboard Manager internal code. Thanks [@masaru-iritani](https://github.com/masaru-iritani)!
- - Improved the Microsoft Store submission ci action to use the proper cli and authentication.
+ - Upgraded Windows App SDK to 1.6.
+ - Upgraded the Target Platform Version to 10.0.22621.0.
+ - Added a bot trigger to automatically add a label to Workspaces issues. Thanks [@plante-msft](https://github.com/plante-msft)!
+ - Fixed a regular expression in the bot triggers for wanting to submit community contributions. Thanks [@PesBandi](https://github.com/PesBandi)!
+ - Fixed analyzer errors after the Visual Studio 17.12 update. Thanks [@snickler](https://github.com/snickler)!
+ - Fixed the TSA configuration for release CI builds.
+ - Refactored automated file component generation during installer builds.
+ - Rewrote the Azure Devops build system to be more modular and share more definitions between PR CI and Release CI.
+ - Fixed debugging of the New+ page of the Settings application when a settings file was not present.
+ - Fixed setting the version of the App Manifest in the File Locksmith and New+ context menu app packages.
+ - Fixed abstracted UI library nuget package signing on release CI.
+ - Removed build status from GitHub README.
 
-#### What is being planned for version 0.83
+#### What is being planned for version 0.86
 
-For [v0.83][github-next-release-work], we'll work on the items below:
+For [v0.86][github-next-release-work], we'll work on the items below:
 
  - Stability / bug fixes
- - New utility: Dev Projects
- - Language selection
  - New module: File Actions Menu
+ - Integrate Sysinternals ZoomIt
 
 ## PowerToys Community
 

doc/devdocs/modules/launcher/new-plugin-checklist.md

@@ -4,7 +4,6 @@
 - [ ] Microsoft plugin project name pattern: `Microsoft.PowerToys.Run.Plugin.{PluginName}`
 - [ ] Community plugin project name pattern: `Community.PowerToys.Run.Plugin.{PluginName}`
 - [ ] The plugin target framework should be `net8.0-windows`
-- [ ] The project file should import `Version.props` and specify `<Version>$(Version).0</Version>`
 - [ ] If the plugin uses any 3rd party dependencies the project file should import `DynamicPlugin.props`
 - [ ] The plugin has to contain a `plugin.json` file of the following format in its root folder:
 

doc/devdocs/modules/launcher/plugins/community.unitconverter.md

@@ -19,13 +19,13 @@ This plugin uses a package called [UnitsNet](https://github.com/angularsen/Units
  - [Temperature](https://github.com/angularsen/UnitsNet/blob/master/UnitsNet/GeneratedCode/Units/TemperatureUnit.g.cs)
  - [Volume](https://github.com/angularsen/UnitsNet/blob/master/UnitsNet/GeneratedCode/Units/VolumeUnit.g.cs)
 
- These are the ones that are currently enabled (though UnitsNet supports many more). They are defined in [`Main.cs`](/src/modules/launcher/Plugins/Community.PowerToys.Run.UnitConverter/Main.cs).
+ These are the ones that are currently enabled (though UnitsNet supports many more). They are defined in [`UnitHandler.cs`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/UnitHandler.cs).
 
 
-### [`InputInterpreter`](/src/modules/launcher/Plugins/Community.PowerToys.Run.UnitConverter/InputInterpreter.cs)
+### [`InputInterpreter`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/InputInterpreter.cs)
  - Class which manipulates user input such that it may be interpreted correctly and thus converted.
  - Uses a regex amongst other things to do this.
 
-### [`UnitHandler`](/src/modules/launcher/Plugins/Community.PowerToys.Run.UnitConverter/UnitHandler.cs)
+### [`UnitHandler`](/src/modules/launcher/Plugins/Community.PowerToys.Run.Plugin.UnitConverter/UnitHandler.cs)
  - Class that does the actual conversion.
  - Supports abbreviations in user input (single, double, or none).

doc/devdocs/modules/launcher/plugins/timedate.md

@@ -71,12 +71,14 @@ The following formats are currently available:
 - All available settings for the plugin are defined in the [`TimeDateSettings`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Components/TimeDateSettings.cs) class of the plugin. The settings can be accessed everywhere in the plugin code via the static class instance `TimeDateSettings.Instance`.
 - We have the following settings that the user can configure to change the behavior of the plugin:
 
-	| Key | Default value | Name | Description |
-	|--------------|-----------|------------|------------|
-	| `OnlyDateTimeNowGlobal` | `true` | Show only 'Time', 'Date', and 'Now' result for system time on global queries | Regardless of this setting, for global queries the first word of the query has to be a complete match. |
-	| `TimeWithSeconds` | `false` | Show time with seconds | This setting applies to the 'Time' and 'Now' result. |
-	| `DateWithWeekday` | `false` | Show date with weekday and name of month | This setting applies to the 'Date' and 'Now' result. |
-	| `HideNumberMessageOnGlobalQuery` | `false` | Hide 'Invalid number input' error message on global queries | |
+	| Key | Type | Default value | Name | Description |
+	|--------------|--------------|-----------|------------|------------|
+	| `CalendarFirstWeekRule` | Combo box | `-1` (Use system settings) | First week of the year | Configure the calendar rule for the first week of the year. |
+	| `FirstDayOfWeek` | Combo box | `-1` (Use system settings) | First day of the week | |
+	| `OnlyDateTimeNowGlobal` | Checkbox | `true` | Show only 'Time', 'Date', and 'Now' result for system time on global queries | Regardless of this setting, for global queries the first word of the query has to be a complete match. |
+	| `TimeWithSeconds` | Checkbox | `false` | Show time with seconds | This setting applies to the 'Time' and 'Now' result. |
+	| `DateWithWeekday` | Checkbox | `false` | Show date with weekday and name of month | This setting applies to the 'Date' and 'Now' result. |
+	| `HideNumberMessageOnGlobalQuery` | Checkbox | `false` | Hide 'Invalid number input' error message on global queries | |
 	
 
 ## Classes
@@ -97,6 +99,7 @@ The following formats are currently available:
 
 ### [`TimeAndDateHelper.cs`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Components/TimeAndDateHelper.cs)
 - The [`TimeAndDateHelper`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Components/TimeAndDateHelper.cs) class contains methods to format/convert date and time formats/strings.
+- And it contains methods to return the `first week day` and `first week of the year rule` based on the current plugin settings.
 
 ### [`TimeDateSettings.cs`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Components/TimeDateSettings.cs)
 - The [`TimeDateSettings`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Components/TimeDateSettings.cs) class provides access to all optional plugin settings.
@@ -129,11 +132,6 @@ On global queries the high score returned by `FuzzySearch` has negative impacts
 ## [Unit Tests](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests)
 We have a [Unit Test project](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests) that executes various test to ensure that the plugin works as expected.
 
-### [`TimeDateResultTests.cs`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests/TimeDateResultTests.cs)
-- The [`TimeDateResultTests.cs`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests/TimeDateResultTests.cs) class contains tests to validate that the time and date values are correctly formatted/calculated.
-- That we can execute the tests at any time on any machine, we use a specified date/time value and set the thread culture always to `en-us` while executing the tests.
-- Some tests contain checks that calculate the expected result at runtime instead of using an expected value written fix in the code. This is done to get valid results on every machine at any time.
-
 ### [`ImageTests.cs`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests/ImageTests.cs)
 - The [`ImageTests.cs`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests/ImageTests.cs) class contains tests to validate that each result shows the expected and correct image.
 - That we can execute the tests at any time on any machine, we set the thread culture always to `en-us` while executing the tests.
@@ -147,4 +145,13 @@ We have a [Unit Test project](/src/modules/launcher/Plugins/Microsoft.PowerToys.
 
 ### [`StringParserTests.cs`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests/StringParserTests.cs)
 - The [`StringParserTests.cs`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests/StringParserTests.cs) class contains tests to validate that the typed string gets converted correctly into a `DateTime` object.
-- That we can execute the tests at any time on any machine, we set the thread culture always to `en-us` while executing the tests.
+- That we can execute the tests at any time on any machine, we set the thread culture always to `en-us` while executing the tests.
+
+### [`TimeAndDateHelperTests.cs`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests/TimeAndDateHelperTests.cs)
+- The [`TimeAndDateHelperTests.cs`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests/TimeAndDateHelperTests.cs) class contains tests to validate important methods form the `TimeAndDateHelper` class that are not used for string parsing.
+
+### [`TimeDateResultTests.cs`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests/TimeDateResultTests.cs)
+- The [`TimeDateResultTests.cs`](/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate.UnitTests/TimeDateResultTests.cs) class contains tests to validate that the time and date values are correctly formatted/calculated.
+- That we can execute the tests at any time on any machine, we use a specified date/time value and set the thread culture always to `en-us` while executing the tests.
+- Some tests use custom settings for the first day of week and the first week of year. (This is done in the tests for the affected results to validate them for different settings/cultures.)
+- Some tests contain checks that calculate the expected result at runtime instead of using an expected value written fix in the code. This is done to get valid results on every machine at any time.

doc/planning/awake.md

@@ -1,20 +1,53 @@
 ---
-last-update: 3-20-2022
+last-update: 7-16-2024
 ---
 
 # PowerToys Awake Changelog
 
 ## Builds
 
-The build ID can be found in `Program.cs` in the `BuildId` variable - it is a unique identifier for the current builds that allows better diagnostics (we can look up the build ID from the logs) and offers a way to triage Awake-specific issues faster independent of the PowerToys version. The build ID does not carry any significance beyond that within the PowerToys code base.
+The build ID can be found in `Core\Constants.cs` in the `BuildId` variable - it is a unique identifier for the current builds that allows better diagnostics (we can look up the build ID from the logs) and offers a way to triage Awake-specific issues faster independent of the PowerToys version. The build ID does not carry any significance beyond that within the PowerToys code base.
 
 The build ID moniker is made up of two components - a reference to a [Halo](https://en.wikipedia.org/wiki/Halo_(franchise)) character, and the date when the work on the specific build started in the format of `MMDDYYYY`.
 
-| Build ID                                                  | Build Date       |
-|:----------------------------------------------------------|:-----------------|
-| [`ATRIOX_04132023`](#ATRIOX_04132023-april-13-2023)       | April 13, 2023   |
-| [`LIBRARIAN_03202022`](#librarian_03202022-march-20-2022) | March 20, 2022   |
-| `ARBITER_01312022`                                        | January 31, 2022 |
+| Build ID                                                           | Build Date         |
+|:-------------------------------------------------------------------|:------------------|
+| [`PROMETHEAN_09082024`](#PROMETHEAN_09082024-september-8-2024)     | September 8, 2024 |
+| [`VISEGRADRELAY_08152024`](#VISEGRADRELAY_08152024-august-15-2024) | August 15, 2024   |
+| [`DAISY023_04102024`](#DAISY023_04102024-april-10-2024)            | April 10, 2024    |
+| [`ATRIOX_04132023`](#ATRIOX_04132023-april-13-2023)                | April 13, 2023    |
+| [`LIBRARIAN_03202022`](#librarian_03202022-march-20-2022)          | March 20, 2022    |
+| `ARBITER_01312022`                                                 | January 31, 2022  |
+
+### `PROMETHEAN_09082024` (September 8, 2024)
+
+>[!NOTE]
+>See pull request: [Awake - `PROMETHEAN_09082024`](https://github.com/microsoft/PowerToys/pull/34717)
+
+- Updating the initialization logic to make sure that settings are respected for proper group policy and single-instance detection.
+- [#34148] Fixed a bug from the previous release that incorrectly synchronized threads for shell icon creation and initialized parent PID when it was not parented.
+
+### `VISEGRADRELAY_08152024` (August 15, 2024)
+
+>[!NOTE]
+>See pull request: [Awake - `VISEGRADRELAY_08152024`](https://github.com/microsoft/PowerToys/pull/34316)
+
+- [#34148](https://github.com/microsoft/PowerToys/issues/34148) Fixes the issue where the Awake icon is not displayed.
+- [#17969](https://github.com/microsoft/PowerToys/issues/17969) Add the ability to bind the process target to the parent of the Awake launcher.
+- PID binding now correctly ignores irrelevant parameters (e.g., expiration, interval) and only works for indefinite periods.
+- Amending the native API surface to make sure that the Win32 error is set correctly.
+
+### `DAISY023_04102024` (April 10, 2024)
+
+>[!NOTE]
+>See pull request: [Awake Update - `DAISY023_04102024`](https://github.com/microsoft/PowerToys/pull/32378)
+
+- [#33630](https://github.com/microsoft/PowerToys/issues/33630) When in the UI and you select `0` as hours and `0` as minutes in `TIMED` awake mode, the UI becomes non-responsive whenever you try to get back to timed after it rolls back to `PASSIVE`.
+- [#12714](https://github.com/microsoft/PowerToys/issues/12714) Adds the option to keep track of Awake state through tray tooltip.
+- [#11996](https://github.com/microsoft/PowerToys/issues/11996) Adds custom icons support for mode changes in Awake.
+- Removes the dependency on `System.Windows.Forms` and instead uses native Windows APIs to create the tray icon.
+- Removes redundant/unused code that impacted application performance.
+- Updates dependent packages to their latest versions (`Microsoft.Windows.CsWinRT` and `System.Reactive`).
 
 ### `ATRIOX_04132023` (April 13, 2023)
 

doc/thirdPartyRunPlugins.md

@@ -36,6 +36,9 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [WebSearchShortcut](https://github.com/Daydreamer-riri/PowerToys-Run-WebSearchShortcut) | [Riri](https://github.com/Daydreamer-riri) | Select a specific search engine to perform searches. |
 | [UnicodeInput](https://github.com/nathancartlidge/powertoys-run-unicode) | [nathancartlidge](https://github.com/nathancartlidge) | Copy Unicode characters to the clipboard |
 | [PowerHexInspector](https://github.com/NaroZeol/PowerHexInspector) | [NaroZeol](https://github.com/NaroZeol) | Peek other forms of an input number |
+| [GitHubRepo](https://github.com/8LWXpg/PowerToysRun-GitHubRepo) | [8LWXpg](https://github.com/8LWXpg) | Search and open GitHub repositories |
+| [ProcessKiller](https://github.com/8LWXpg/PowerToysRun-ProcessKiller) | [8LWXpg](https://github.com/8LWXpg) | Search and kill processes |
+| [ChatGPT](https://github.com/ferraridavide/ChatGPTPowerToys) | [ferraridavide](https://github.com/ferraridavide) | Ask a question to ChatGPT |
 
 ## Extending software plugins
 
@@ -47,6 +50,7 @@ Below are community created plugins that target a website or software.  They are
 | [Edge Workspaces](https://github.com/quachpas/PowerToys-Run-EdgeWorkspaces) | [quachpas](https://github.com/quachpas) | Open Microsoft Edge workspaces|
 | [Everything](https://github.com/lin-ycv/EverythingPowerToys) | [Yu Chieh (Victor) Lin](https://github.com/Lin-ycv) | Get search results from Everything |
 | [GitKraken](https://github.com/davidegiacometti/PowerToys-Run-GitKraken) | [davidegiacometti](https://github.com/davidegiacometti) | Open GitKraken repositories |
+| [RDP](https://github.com/anthony81799/PowerToysRun-RDP) | [anthony81799](https://github.com/anthony81799) | Open Remote Desktop connections |
 | [Visual Studio Recents](https://github.com/davidegiacometti/PowerToys-Run-VisualStudio) | [davidegiacometti](https://github.com/davidegiacometti) | Open Visual Studio recents |
 | [WinGet](https://github.com/bostrot/PowerToysRunPluginWinget) | [bostrot](https://github.com/bostrot) | Search and install packages from WinGet |
 | [Scoop](https://github.com/Quriz/PowerToysRunScoop) | [Quriz](https://github.com/Quriz) | Search and install packages from Scoop |

installer/PowerToysSetup/Common.wxi

@@ -18,6 +18,7 @@
   <?define AdvancedPasteProjectName="AdvancedPaste"?>
   <?define RegistryPreviewProjectName="RegistryPreview"?>
   <?define PeekProjectName="Peek"?>
+  <?define WorkspacesProjectName="Workspaces"?>
   
   <?define RepoDir="$(var.ProjectDir)..\..\" ?>
   <?if $(var.Platform) = x64?>

installer/PowerToysSetup/Core.wxs

@@ -51,8 +51,8 @@
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
           <RegistryValue Type="string" Name="DSCModulesReference" Value="" KeyPath="yes"/>
         </RegistryKey>
-        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version)\Microsoft.PowerToys.Configure.psd1" Id="PTConfReference.psd1" />
-        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version)\Microsoft.PowerToys.Configure.psm1" Id="PTConfReference.psm1" />
+        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psd1" Id="PTConfReference.psd1" />
+        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psm1" Id="PTConfReference.psm1" />
       </Component>
     </DirectoryRef>
 
@@ -63,11 +63,11 @@
       <Directory Id="WindowsPowerShellFolder" Name="WindowsPowerShell">
         <Directory Id="PowerShellModulesFolder" Name="Modules">
           <Directory Id="PowerToysDscFolder" Name="Microsoft.PowerToys.Configure">
-            <Directory Id="PowerToysDscVerFolder" Name="$(var.Version)">
+            <Directory Id="PowerToysDscVerFolder" Name="$(var.Version).0">
               <Component Id="PowerToysDSC" Win64="yes" Guid="C52AECA0-DA73-49B8-BB49-31EF6640FF1F">
                 <!-- Don't fail installation because of DSC. Files are marked as not vital. -->
-                <File Vital="no" Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version)\Microsoft.PowerToys.Configure.psd1" Id="PTConf.psd1" />
-                <File Vital="no" Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version)\Microsoft.PowerToys.Configure.psm1" Id="PTConf.psm1" />
+                <File Vital="no" Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psd1" Id="PTConf.psd1" />
+                <File Vital="no" Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psm1" Id="PTConf.psm1" />
               </Component>
             </Directory>
           </Directory>

installer/PowerToysSetup/KeyboardManager.wxs

@@ -25,11 +25,9 @@
         <?if $(sys.BUILDARCH) = x64 ?>
           <File Source="$(var.BinDir)KeyboardManagerEditor\vcruntime140_1_app.dll" />
         <?endif ?>
-        <!-- Latest CppWinRT upgrade made Keyboard Manager Editor depend on additional VC Runtime libraries. -->
-        <!-- These are not in the Keyboard Manager Editor build output. So we copy them from the base build directory. -->
-        <File Source="$(var.BinDir)vcruntime140.dll" />
-        <File Source="$(var.BinDir)vcruntime140_1.dll" />
-        <File Source="$(var.BinDir)msvcp140.dll" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\vcruntime140.dll" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\vcruntime140_1.dll" />
+        <File Source="$(var.BinDir)KeyboardManagerEditor\msvcp140.dll" />
       </Component>
     </DirectoryRef>
 

installer/PowerToysSetup/NewPlus.wxs

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+   xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
+
+   <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+   <?define NewPlusAssetsFiles=?>
+   <?define NewPlusAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\?>
+   <?define NewPlusTemplateFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\Templates\?>
+   <?define NewPlusTemplateSubFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\Templates\Example folder\?>
+
+   <Fragment>
+
+      <!-- Assets -->
+      <DirectoryRef Id="WinUI3AppsAssetsFolder">
+         <Directory Id="NewPlusAssetsInstallFolder" Name="NewPlus" />
+      </DirectoryRef>
+      <DirectoryRef Id="NewPlusAssetsInstallFolder" FileSource="$(var.NewPlusAssetsFilesPath)">
+         <!-- Generated by generateFileComponents.ps1 -->
+         <!--NewPlusAssetsFiles_Component_Def-->
+      </DirectoryRef>
+
+      <ComponentGroup Id="NewPlusComponentGroup">
+         <Component Id="RemoveNewPlusFolder" Guid="4189C789-56EB-409D-912E-3F4F3F4F1FFA" Directory="NewPlusAssetsInstallFolder" >
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="RemoveNewPlusFolder" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <RemoveFolder Id="RemoveFolderNewPlusAssetsFolder" Directory="NewPlusAssetsInstallFolder" On="uninstall"/>
+         </Component>
+      </ComponentGroup>
+
+      
+      <!-- Example templates -->
+      <DirectoryRef Id="WinUI3AppsAssetsFolder">
+         <Directory Id="NewPlusInstallFolder" Name="NewPlus">
+            <Directory Id="NewPlusTemplatesInstallFolder" Name="Templates">
+               <Directory Id="NewPlusTemplatesSubInstallFolder" Name="Example folder"/>
+            </Directory>
+         </Directory>
+      </DirectoryRef>
+      <DirectoryRef Id="NewPlusTemplatesInstallFolder" FileSource="$(var.NewPlusTemplateFilesPath)">
+         <Component Id="NewPlusTemplateFiles_Component" Win64="yes" Guid="39264075-4B7F-40E3-A76F-21E68576D43E">
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="NewPlusTemplateFiles_Component" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <File Id="NewPlusTemplateFiles_File_1.md" Source="$(var.NewPlusTemplateFilesPath)Any files or folders placed in the template folder are available via New+.txt" />
+         </Component>
+      </DirectoryRef>
+      <DirectoryRef Id="NewPlusTemplatesSubInstallFolder" FileSource="$(var.NewPlusTemplateSubFilesPath)">
+         <Component Id="NewPlusTemplateSubFiles_Component" Win64="yes" Guid="7618E61C-CCB8-492F-B284-E1AE2954AF0B">
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="NewPlusTemplateSubFiles_Component" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <File Id="NewPlusTemplateSubFiles_File_1.md" Source="$(var.NewPlusTemplateSubFilesPath)Example txt file.txt" />
+            <File Id="NewPlusTemplateSubFiles_File_2.md" Source="$(var.NewPlusTemplateSubFilesPath)Another example txt file.txt" />
+         </Component>
+      </DirectoryRef>
+
+      <ComponentGroup Id="NewPlusTemplatesComponentGroup">
+         <Component Id="RemoveNewPlusTemplateFolder" Guid="3E9B15CA-A50C-42DA-977F-5E9914562FE7" Directory="NewPlusInstallFolder" >
+            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+               <RegistryValue Type="string" Name="RemoveNewPlusTemplateFolder" Value="" KeyPath="yes"/>
+            </RegistryKey>
+            <RemoveFolder Id="RemoveFolderNewPlusInstallFolder" Directory="NewPlusInstallFolder" On="uninstall"/>
+            <RemoveFolder Id="RemoveFolderNewPlusTemplatesInstallFolder" Directory="NewPlusTemplatesInstallFolder" On="uninstall"/>
+            <RemoveFolder Id="RemoveFolderNewPlusTemplatesSubInstallFolder" Directory="NewPlusTemplatesSubInstallFolder" On="uninstall"/>
+         </Component>
+         <ComponentRef Id="NewPlusTemplateFiles_Component" />
+         <ComponentRef Id="NewPlusTemplateSubFiles_Component" />
+      </ComponentGroup>
+
+   </Fragment>
+</Wix>

installer/PowerToysSetup/PowerToysBootstrapper.wixproj

@@ -3,9 +3,9 @@
   DefaultTargets="Build"
   InitialTargets="EnsureNuGetPackageBuildImports"
   xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\wix.props"
-    Condition="Exists('..\wix.props')" />
-  <Import Project="..\..\src\Version.props" />
+  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
+  <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
+
   <PropertyGroup>
     <DefineConstants>Version=$(Version)</DefineConstants>
     <Name>PowerToysBootstrapper</Name>
@@ -76,4 +76,12 @@
     <Error Condition="!Exists('..\wix.props')"
       Text="$([System.String]::Format('$(ErrorText)', '..\wix.props'))" />
   </Target>
+
+  <!-- Prevents NU1503 -->
+  <Target Name="_IsProjectRestoreSupported" Returns="@(_ValidProjectsForRestore)">
+    <ItemGroup>
+      <_ValidProjectsForRestore Include="$(MSBuildProjectFullPath)" />
+    </ItemGroup>
+  </Target>
+  <Target Name="Restore" />
 </Project>

installer/PowerToysSetup/PowerToysInstaller.wixproj

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
   <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
-  <Import Project="..\..\src\Version.props" />
   <PropertyGroup Condition="'$(Platform)' == 'x64'">
     <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
     <!-- THIS IS AN INNER LOOP OPTIMIZATION
@@ -17,7 +16,6 @@ call "..\..\..\publish.cmd" x64
 call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
     </PreBuildEvent>
   </PropertyGroup>
-
   <PropertyGroup Condition="'$(Platform)' != 'x64'">
     <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC</DefineConstants>
     <PreBuildEvent>IF NOT DEFINED IsPipeline (
@@ -31,31 +29,32 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
   <PropertyGroup>
     <RunPostBuildEvent>Always</RunPostBuildEvent>
     <PostBuildEvent>
-    call move /Y ..\..\..\AdvancedPaste.wxs.bk ..\..\..\AdvancedPaste.wxs
-    call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.wxs
-    call move /Y ..\..\..\BaseApplications.wxs.bk ..\..\..\BaseApplications.wxs
-    call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs
-    call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs
-    call move /Y ..\..\..\EnvironmentVariables.wxs.bk ..\..\..\EnvironmentVariables.wxs
-    call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs
-    call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs
-    call move /Y ..\..\..\Hosts.wxs.bk ..\..\..\Hosts.wxs
-    call move /Y ..\..\..\ImageResizer.wxs.bk ..\..\..\ImageResizer.wxs
-    call move /Y ..\..\..\KeyboardManager.wxs.bk ..\..\..\KeyboardManager.wxs
-    call move /Y ..\..\..\MouseWithoutBorders.wxs.bk ..\..\..\MouseWithoutBorders.wxs
-    call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs
-    call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.wxs
-    call move /Y ..\..\..\Product.wxs.bk ..\..\..\Product.wxs
-    call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs
-    call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs
-    call move /Y ..\..\..\Run.wxs.bk ..\..\..\Run.wxs
-    call move /Y ..\..\..\Settings.wxs.bk ..\..\..\Settings.wxs
-    call move /Y ..\..\..\ShortcutGuide.wxs.bk ..\..\..\ShortcutGuide.wxs
-    call move /Y ..\..\..\Tools.wxs.bk ..\..\..\Tools.wxs
-    call move /Y ..\..\..\VideoConference.wxs.bk ..\..\..\VideoConference.wxs
-    call move /Y ..\..\..\WinAppSDK.wxs.bk ..\..\..\WinAppSDK.wxs
-    call move /Y ..\..\..\WinUI3Applications.wxs.bk ..\..\..\WinUI3Applications.wxs
-    </PostBuildEvent>
+      call move /Y ..\..\..\AdvancedPaste.wxs.bk ..\..\..\AdvancedPaste.wxs
+      call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.wxs
+      call move /Y ..\..\..\BaseApplications.wxs.bk ..\..\..\BaseApplications.wxs
+      call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs
+      call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs
+      call move /Y ..\..\..\EnvironmentVariables.wxs.bk ..\..\..\EnvironmentVariables.wxs
+      call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs
+      call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs
+      call move /Y ..\..\..\Hosts.wxs.bk ..\..\..\Hosts.wxs
+      call move /Y ..\..\..\ImageResizer.wxs.bk ..\..\..\ImageResizer.wxs
+      call move /Y ..\..\..\KeyboardManager.wxs.bk ..\..\..\KeyboardManager.wxs
+      call move /Y ..\..\..\MouseWithoutBorders.wxs.bk ..\..\..\MouseWithoutBorders.wxs
+      call move /Y ..\..\..\NewPlus.wxs.bk ..\..\..\NewPlus.wxs
+      call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs
+      call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.wxs
+      call move /Y ..\..\..\Product.wxs.bk ..\..\..\Product.wxs
+      call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs
+      call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs
+      call move /Y ..\..\..\Run.wxs.bk ..\..\..\Run.wxs
+      call move /Y ..\..\..\Settings.wxs.bk ..\..\..\Settings.wxs
+      call move /Y ..\..\..\ShortcutGuide.wxs.bk ..\..\..\ShortcutGuide.wxs
+      call move /Y ..\..\..\Tools.wxs.bk ..\..\..\Tools.wxs
+      call move /Y ..\..\..\VideoConference.wxs.bk ..\..\..\VideoConference.wxs
+      call move /Y ..\..\..\WinAppSDK.wxs.bk ..\..\..\WinAppSDK.wxs
+      call move /Y ..\..\..\WinUI3Applications.wxs.bk ..\..\..\WinUI3Applications.wxs
+      </PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <Name>PowerToysInstaller</Name>
@@ -66,7 +65,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
   <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
     <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
   </PropertyGroup>
-
   <PropertyGroup>
     <!-- We do not support debug installer builds -->
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
@@ -101,8 +99,8 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <Compile Include="CustomDialogs\PTInstallDirDlg.wxs" />
     <Compile Include="CustomDialogs\PTLicenseDlg.wxs" />
     <Compile Include="CustomDialogs\WixUI_PTInstallDir.wxs" />
+    <Compile Include="NewPlus.wxs" />
     <Compile Include="Product.wxs" />
-
     <Compile Include="AdvancedPaste.wxs" />
     <Compile Include="Awake.wxs" />
     <Compile Include="BaseApplications.wxs" />
@@ -123,9 +121,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <Compile Include="VideoConference.wxs" />
     <Compile Include="MouseWithoutBorders.wxs" />
     <Compile Include="WinUI3Applications.wxs" />
-
     <Compile Include="MonacoSRC.wxs" />
-
     <Compile Include="Core.wxs" />
     <Compile Include="Resources.wxs" />
     <Compile Include="WinAppSDK.wxs" />
@@ -183,6 +179,13 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
 	<Target Name="AfterBuild">
 	</Target> -->
   <Target Name="BeforeBuild">
-    <HeatDirectory Directory="..\..\src\common\FilePreviewCommon\Assets\Monaco\monacoSRC" PreprocessorVariable="var.MonacoSRCHarvestPath" OutputFile="MonacoSRC.wxs" ComponentGroupName="MonacoSRCHeatGenerated" DirectoryRefId="MonacoPreviewHandlerMonacoSRCFolder" AutogenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" RunAsSeparateProcess="true" SuppressFragments="false" SuppressRegistry="false" SuppressRootDirectory="true"/>
+    <HeatDirectory Directory="..\..\src\common\FilePreviewCommon\Assets\Monaco\monacoSRC" PreprocessorVariable="var.MonacoSRCHarvestPath" OutputFile="MonacoSRC.wxs" ComponentGroupName="MonacoSRCHeatGenerated" DirectoryRefId="MonacoPreviewHandlerMonacoSRCFolder" AutogenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" RunAsSeparateProcess="true" SuppressFragments="false" SuppressRegistry="false" SuppressRootDirectory="true" />
   </Target>
+  <!-- Prevents NU1503 -->
+  <Target Name="_IsProjectRestoreSupported" Returns="@(_ValidProjectsForRestore)">
+    <ItemGroup>
+      <_ValidProjectsForRestore Include="$(MSBuildProjectFullPath)" />
+    </ItemGroup>
+  </Target>
+  <Target Name="Restore" />
 </Project>

installer/PowerToysSetup/Product.wxs

@@ -73,6 +73,8 @@
       <ComponentGroupRef Id="MouseWithoutBordersComponentGroup" />
       <ComponentGroupRef Id="EnvironmentVariablesComponentGroup" />
       <ComponentGroupRef Id="AdvancedPasteComponentGroup" />
+      <ComponentGroupRef Id="NewPlusComponentGroup" />
+      <ComponentGroupRef Id="NewPlusTemplatesComponentGroup" />
       <ComponentGroupRef Id="ResourcesComponentGroup" />
       <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
       <ComponentGroupRef Id="ToolComponentGroup" />

installer/PowerToysSetup/Resources.wxs

@@ -449,6 +449,15 @@
         </RegistryKey>
         <File Id="PowerOCR_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PowerOCR.resources.dll" />
       </Component>
+      <Component
+          Id="WorkspacesEditor_$(var.IdSafeLanguage)_Component"
+          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
+          Guid="$(var.CompGUIDPrefix)21">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="WorkspacesEditor_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
+        </RegistryKey>
+        <File Id="WorkspacesEditor_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.WorkspacesEditor.resources.dll" />
+      </Component>
       <?undef IdSafeLanguage?>
       <?undef CompGUIDPrefix?>
       <?endforeach?>

installer/PowerToysSetup/generateAllFileComponents.ps1

@@ -6,6 +6,130 @@ Param(
     [string]$installscopeperuser = "false"
 )
 
+Function Generate-FileList() {
+    [CmdletBinding()]
+    Param(
+        # Can be multiple files separated by ; as long as they're on the same directory
+        [Parameter(Mandatory = $True, Position = 1)]
+        [AllowEmptyString()]
+        [string]$fileDepsJson,
+        [Parameter(Mandatory = $True, Position = 2)]
+        [string]$fileListName,
+        [Parameter(Mandatory = $True, Position = 3)]
+        [string]$wxsFilePath,
+        # If there is no deps.json file, just pass path to files
+        [Parameter(Mandatory = $False, Position = 4)]
+        [string]$depsPath,
+        # launcher plugins are being loaded into launcher process,
+        # so there are some additional dependencies to skip
+        [Parameter(Mandatory = $False, Position = 5)]
+        [bool]$isLauncherPlugin
+    )
+
+    $fileWxs = Get-Content $wxsFilePath;
+
+    $fileExclusionList = @("*.pdb", "*.lastcodeanalysissucceeded", "createdump.exe", "powertoys.exe")
+
+    $fileInclusionList = @("*.dll", "*.exe", "*.json", "*.msix", "*.png", "*.gif", "*.ico", "*.cur", "*.svg", "index.html", "reg.js", "gitignore.js", "monacoSpecialLanguages.js", "customTokenColors.js", "*.pri")
+
+    $dllsToIgnore = @("System.CodeDom.dll", "WindowsBase.dll")
+
+    if ($fileDepsJson -eq [string]::Empty) {
+        $fileDepsRoot = $depsPath
+    } else {
+        $multipleDepsJson = $fileDepsJson.Split(";")
+
+        foreach ( $singleDepsJson in $multipleDepsJson )
+        {
+
+            $fileDepsRoot = (Get-ChildItem $singleDepsJson).Directory.FullName
+            $depsJson = Get-Content $singleDepsJson | ConvertFrom-Json
+
+            $runtimeList = ([array]$depsJson.targets.PSObject.Properties)[-1].Value.PSObject.Properties | Where-Object {
+                $_.Name -match "runtimepack.*Runtime"
+            };
+
+            $runtimeList | ForEach-Object {
+                $_.Value.PSObject.Properties.Value | ForEach-Object {
+                    $fileExclusionList += $_.PSObject.Properties.Name
+                }
+            }
+        }
+    }
+
+    $fileExclusionList = $fileExclusionList | Where-Object {$_ -notin $dllsToIgnore}
+
+    if ($isLauncherPlugin -eq $True) {
+        $fileInclusionList += @("*.deps.json")
+        $fileExclusionList += @("Ijwhost.dll", "PowerToys.Common.UI.dll", "PowerToys.GPOWrapper.dll", "PowerToys.GPOWrapperProjection.dll", "PowerToys.PowerLauncher.Telemetry.dll", "PowerToys.ManagedCommon.dll", "PowerToys.Settings.UI.Lib.dll", "Wox.Infrastructure.dll", "Wox.Plugin.dll")
+    }
+
+    $fileList = Get-ChildItem $fileDepsRoot -Include $fileInclusionList -Exclude $fileExclusionList -File -Name
+
+    $fileWxs = $fileWxs -replace "(<\?define $($fileListName)=)", "<?define $fileListName=$($fileList -join ';')"
+
+    Set-Content -Path $wxsFilePath -Value $fileWxs
+}
+
+Function Generate-FileComponents() {
+    [CmdletBinding()]
+    Param(
+        [Parameter(Mandatory = $True, Position = 1)]
+        [string]$fileListName,
+        [Parameter(Mandatory = $True, Position = 2)]
+        [string]$wxsFilePath,
+        [Parameter(Mandatory = $True, Position = 3)]
+        [string]$regroot
+    )
+
+    $wxsFile = Get-Content $wxsFilePath;
+
+    $wxsFile | ForEach-Object {
+        if ($_ -match "(<?define $fileListName=)(.*)\?>") {
+            [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', 'fileList',
+            Justification = 'variable is used in another scope')]
+
+            $fileList = $matches[2] -split ';'
+            return
+        }
+    }
+
+    $componentId = "$($fileListName)_Component"
+
+    $componentDefs = "`r`n"
+    $componentDefs +=
+    @"
+            <Component Id="$($componentId)" Win64="yes" Guid="$((New-Guid).ToString().ToUpper())">
+              <RegistryKey Root="$($regroot)" Key="Software\Classes\powertoys\components">
+                <RegistryValue Type="string" Name="$($componentId)" Value="" KeyPath="yes"/>
+              </RegistryKey>`r`n
+"@
+
+    foreach ($file in $fileList) {
+        $fileTmp = $file -replace "-", "_"
+        $componentDefs +=
+    @"
+              <File Id="$($fileListName)_File_$($fileTmp)" Source="`$(var.$($fileListName)Path)\$($file)" />`r`n
+"@
+    }
+
+    $componentDefs +=
+    @"
+            </Component>`r`n
+"@
+
+    $wxsFile = $wxsFile -replace "\s+(<!--$($fileListName)_Component_Def-->)", $componentDefs
+
+    $componentRef =
+    @"
+            <ComponentRef Id="$($componentId)" />
+"@
+
+    $wxsFile = $wxsFile -replace "\s+(</ComponentGroup>)", "$componentRef`r`n    </ComponentGroup>"
+
+    Set-Content -Path $wxsFilePath -Value $wxsFile
+}
+
 if ($platform -ceq "arm64") {
     $platform = "ARM64"
 }
@@ -17,175 +141,179 @@ if ($installscopeperuser -eq "true") {
 }
 
 #BaseApplications
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName BaseApplicationsFiles -wxsFilePath $PSScriptRoot\BaseApplications.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""BaseApplicationsFiles"" -wxsFilePath $PSScriptRoot\BaseApplications.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName BaseApplicationsFiles -wxsFilePath $PSScriptRoot\BaseApplications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release"
+Generate-FileComponents -fileListName "BaseApplicationsFiles" -wxsFilePath $PSScriptRoot\BaseApplications.wxs -regroot $registryroot
 
 #WinUI3Applications
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinUI3ApplicationsFiles -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinUI3ApplicationsFiles"" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName WinUI3ApplicationsFiles -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps"
+Generate-FileComponents -fileListName "WinUI3ApplicationsFiles" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -regroot $registryroot
 
 #AdvancedPaste
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName AdvancedPasteAssetsFiles -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\AdvancedPaste"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""AdvancedPasteAssetsFiles"" -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName AdvancedPasteAssetsFiles -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\AdvancedPaste"
+Generate-FileComponents -fileListName "AdvancedPasteAssetsFiles" -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -regroot $registryroot
 
 #AwakeFiles
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName AwakeImagesFiles -wxsFilePath $PSScriptRoot\Awake.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\Awake"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""AwakeImagesFiles"" -wxsFilePath $PSScriptRoot\Awake.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName AwakeImagesFiles -wxsFilePath $PSScriptRoot\Awake.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Awake"
+Generate-FileComponents -fileListName "AwakeImagesFiles" -wxsFilePath $PSScriptRoot\Awake.wxs -regroot $registryroot
 
 #ColorPicker
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ColorPickerAssetsFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\ColorPicker"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ColorPickerAssetsFiles"" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName ColorPickerAssetsFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ColorPicker"
+Generate-FileComponents -fileListName "ColorPickerAssetsFiles" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot
 
 #Environment Variables
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName EnvironmentVariablesAssetsFiles -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\EnvironmentVariables"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""EnvironmentVariablesAssetsFiles"" -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName EnvironmentVariablesAssetsFiles -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\EnvironmentVariables"
+Generate-FileComponents -fileListName "EnvironmentVariablesAssetsFiles" -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -regroot $registryroot
 
 #FileExplorerAdd-ons
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName MonacoPreviewHandlerMonacoAssetsFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName MonacoPreviewHandlerCustomLanguagesFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco\customLanguages"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MonacoPreviewHandlerMonacoAssetsFiles"" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""MonacoPreviewHandlerCustomLanguagesFiles"" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerMonacoAssetsFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco"
+Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerCustomLanguagesFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco\customLanguages"
+Generate-FileComponents -fileListName "MonacoPreviewHandlerMonacoAssetsFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "MonacoPreviewHandlerCustomLanguagesFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot
 
 #FileLocksmith
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName FileLocksmithAssetsFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\FileLocksmith"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FileLocksmithAssetsFiles"" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName FileLocksmithAssetsFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\FileLocksmith"
+Generate-FileComponents -fileListName "FileLocksmithAssetsFiles" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -regroot $registryroot
 
 #Hosts
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName HostsAssetsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Hosts"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""HostsAssetsFiles"" -wxsFilePath $PSScriptRoot\Hosts.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName HostsAssetsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Hosts"
+Generate-FileComponents -fileListName "HostsAssetsFiles" -wxsFilePath $PSScriptRoot\Hosts.wxs -regroot $registryroot
 
 #ImageResizer
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\ImageResizer"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ImageResizerAssetsFiles"" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ImageResizer"
+Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot
+
+#New+
+Generate-FileList -fileDepsJson "" -fileListName NewPlusAssetsFiles -wxsFilePath $PSScriptRoot\NewPlus.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\NewPlus"
+Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs -regroot $registryroot
 
 #Peek
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Peek\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PeekAssetsFiles"" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Peek\"
+Generate-FileComponents -fileListName "PeekAssetsFiles" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot
 
 #PowerRename
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PowerRenameAssetsFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerRename\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerRenameAssetsFiles"" -wxsFilePath $PSScriptRoot\PowerRename.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName PowerRenameAssetsFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerRename\"
+Generate-FileComponents -fileListName "PowerRenameAssetsFiles" -wxsFilePath $PSScriptRoot\PowerRename.wxs -regroot $registryroot
 
 #RegistryPreview
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName RegistryPreviewAssetsFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\RegistryPreview\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""RegistryPreviewAssetsFiles"" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName RegistryPreviewAssetsFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\RegistryPreview\"
+Generate-FileComponents -fileListName "RegistryPreviewAssetsFiles" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -regroot $registryroot
 
 #Run
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName launcherImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\PowerLauncher"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""launcherImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName launcherImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\PowerLauncher"
+Generate-FileComponents -fileListName "launcherImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ## Plugins
 ###Calculator
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.deps.json"" -fileListName calcComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName calcImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""calcComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""calcImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.deps.json" -fileListName calcComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName calcImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Images"
+Generate-FileComponents -fileListName "calcComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "calcImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Folder
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Microsoft.Plugin.Folder.deps.json"" -fileListName FolderComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName FolderImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FolderComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""FolderImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Microsoft.Plugin.Folder.deps.json" -fileListName FolderComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName FolderImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Images"
+Generate-FileComponents -fileListName "FolderComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "FolderImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Program
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Microsoft.Plugin.Program.deps.json"" -fileListName ProgramComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ProgramImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ProgramComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ProgramImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Microsoft.Plugin.Program.deps.json" -fileListName ProgramComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ProgramImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Images"
+Generate-FileComponents -fileListName "ProgramComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ProgramImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Shell
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Microsoft.Plugin.Shell.deps.json"" -fileListName ShellComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ShellImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ShellComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ShellImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Microsoft.Plugin.Shell.deps.json" -fileListName ShellComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ShellImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Images"
+Generate-FileComponents -fileListName "ShellComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ShellImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Indexer
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Microsoft.Plugin.Indexer.deps.json"" -fileListName IndexerComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName IndexerImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""IndexerComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""IndexerImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Microsoft.Plugin.Indexer.deps.json" -fileListName IndexerComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName IndexerImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Images"
+Generate-FileComponents -fileListName "IndexerComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "IndexerImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###UnitConverter
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.deps.json"" -fileListName UnitConvCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName UnitConvImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UnitConvCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UnitConvImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.deps.json" -fileListName UnitConvCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName UnitConvImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Images"
+Generate-FileComponents -fileListName "UnitConvCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "UnitConvImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###WebSearch
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Community.PowerToys.Run.Plugin.WebSearch.deps.json"" -fileListName WebSrchCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WebSrchImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WebSrchCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WebSrchImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Community.PowerToys.Run.Plugin.WebSearch.deps.json" -fileListName WebSrchCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WebSrchImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Images"
+Generate-FileComponents -fileListName "WebSrchCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WebSrchImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###History
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Microsoft.PowerToys.Run.Plugin.History.deps.json"" -fileListName HistoryPluginComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName HistoryPluginImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""HistoryPluginComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""HistoryPluginImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Microsoft.PowerToys.Run.Plugin.History.deps.json" -fileListName HistoryPluginComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName HistoryPluginImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Images"
+Generate-FileComponents -fileListName "HistoryPluginComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "HistoryPluginImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Uri
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Microsoft.Plugin.Uri.deps.json"" -fileListName UriComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName UriImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UriComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""UriImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Microsoft.Plugin.Uri.deps.json" -fileListName UriComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName UriImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Images"
+Generate-FileComponents -fileListName "UriComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "UriImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###VSCodeWorkspaces
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.deps.json"" -fileListName VSCWrkCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName VSCWrkImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""VSCWrkCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""VSCWrkImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.deps.json" -fileListName VSCWrkCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName VSCWrkImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Images"
+Generate-FileComponents -fileListName "VSCWrkCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "VSCWrkImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###WindowWalker
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Microsoft.Plugin.WindowWalker.deps.json"" -fileListName WindowWlkrCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WindowWlkrImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WindowWlkrCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WindowWlkrImagesCompFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Microsoft.Plugin.WindowWalker.deps.json" -fileListName WindowWlkrCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WindowWlkrImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Images"
+Generate-FileComponents -fileListName "WindowWlkrCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WindowWlkrImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###OneNote
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Microsoft.PowerToys.Run.Plugin.OneNote.deps.json"" -fileListName OneNoteComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName OneNoteImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""OneNoteComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""OneNoteImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Microsoft.PowerToys.Run.Plugin.OneNote.deps.json" -fileListName OneNoteComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName OneNoteImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Images"
+Generate-FileComponents -fileListName "OneNoteComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "OneNoteImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Registry
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Microsoft.PowerToys.Run.Plugin.Registry.deps.json"" -fileListName RegistryComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName RegistryImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""RegistryComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""RegistryImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Microsoft.PowerToys.Run.Plugin.Registry.deps.json" -fileListName RegistryComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName RegistryImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Images"
+Generate-FileComponents -fileListName "RegistryComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "RegistryImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###Service
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Microsoft.PowerToys.Run.Plugin.Service.deps.json"" -fileListName ServiceComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ServiceImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ServiceComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ServiceImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Microsoft.PowerToys.Run.Plugin.Service.deps.json" -fileListName ServiceComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ServiceImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Images"
+Generate-FileComponents -fileListName "ServiceComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ServiceImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###System
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Microsoft.PowerToys.Run.Plugin.System.deps.json"" -fileListName SystemComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SystemImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SystemComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SystemImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Microsoft.PowerToys.Run.Plugin.System.deps.json" -fileListName SystemComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName SystemImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Images"
+Generate-FileComponents -fileListName "SystemComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SystemImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###TimeDate
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Microsoft.PowerToys.Run.Plugin.TimeDate.deps.json"" -fileListName TimeDateComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName TimeDateImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""TimeDateComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""TimeDateImagesComponentFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Microsoft.PowerToys.Run.Plugin.TimeDate.deps.json" -fileListName TimeDateComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName TimeDateImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Images"
+Generate-FileComponents -fileListName "TimeDateComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "TimeDateImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###WindowsSettings
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Microsoft.PowerToys.Run.Plugin.WindowsSettings.deps.json"" -fileListName WinSetCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinSetImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinSetCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinSetImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Microsoft.PowerToys.Run.Plugin.WindowsSettings.deps.json" -fileListName WinSetCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WinSetImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Images"
+Generate-FileComponents -fileListName "WinSetCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinSetImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###WindowsTerminal
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json"" -fileListName WinTermCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName WinTermImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinTermCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""WinTermImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json" -fileListName WinTermCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName WinTermImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Images"
+Generate-FileComponents -fileListName "WinTermCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinTermImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###PowerToys
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.deps.json"" -fileListName PowerToysCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName PowerToysImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerToysCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""PowerToysImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.deps.json" -fileListName PowerToysCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName PowerToysImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Images"
+Generate-FileComponents -fileListName "PowerToysCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "PowerToysImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ###ValueGenerator
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Community.PowerToys.Run.Plugin.ValueGenerator.deps.json"" -fileListName ValueGeneratorCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1"
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ValueGeneratorImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Images"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ValueGeneratorCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ValueGeneratorImagesCmpFiles"" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Community.PowerToys.Run.Plugin.ValueGenerator.deps.json" -fileListName ValueGeneratorCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
+Generate-FileList -fileDepsJson "" -fileListName ValueGeneratorImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Images"
+Generate-FileComponents -fileListName "ValueGeneratorCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ValueGeneratorImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
 ## Plugins
 
 #ShortcutGuide
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName ShortcutGuideSvgFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\Assets\ShortcutGuide\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""ShortcutGuideSvgFiles"" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName ShortcutGuideSvgFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ShortcutGuide\"
+Generate-FileComponents -fileListName "ShortcutGuideSvgFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -regroot $registryroot
 
 #Settings
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2AssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2OOBEAssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\OOBE\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileList.ps1 -fileDepsJson """" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath ""$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Icons\"""
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2AssetsFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2AssetsModulesFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2OOBEAssetsModulesFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
-Invoke-Expression -Command "$PSScriptRoot\generateFileComponents.ps1 -fileListName ""SettingsV2OOBEAssetsFluentIconsFiles"" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot"
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\"
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\"
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\OOBE\"
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Icons\"
+Generate-FileComponents -fileListName "SettingsV2AssetsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2AssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2OOBEAssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SettingsV2OOBEAssetsFluentIconsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot

installer/PowerToysSetup/generateFileComponents.ps1

@@ -1,56 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory = $True, Position = 1)]
-    [string]$fileListName,
-    [Parameter(Mandatory = $True, Position = 2)]
-    [string]$wxsFilePath,
-    [Parameter(Mandatory = $True, Position = 3)]
-    [string]$regroot
-)
-
-$wxsFile = Get-Content $wxsFilePath;
-
-$wxsFile | ForEach-Object {
-    if ($_ -match "(<?define $fileListName=)(.*)\?>") {
-        [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', 'fileList',
-        Justification = 'variable is used in another scope')]
-
-        $fileList = $matches[2] -split ';'
-        return
-    }
-}
-
-$componentId = "$($fileListName)_Component"
-
-$componentDefs = "`r`n"
-$componentDefs +=
-@"
-        <Component Id="$($componentId)" Win64="yes" Guid="$((New-Guid).ToString().ToUpper())">
-          <RegistryKey Root="$($regroot)" Key="Software\Classes\powertoys\components">
-            <RegistryValue Type="string" Name="$($componentId)" Value="" KeyPath="yes"/>
-          </RegistryKey>`r`n
-"@
-
-foreach ($file in $fileList) {
-    $fileTmp = $file -replace "-", "_"
-    $componentDefs +=
-@"
-          <File Id="$($fileListName)_File_$($fileTmp)" Source="`$(var.$($fileListName)Path)\$($file)" />`r`n
-"@
-}
-
-$componentDefs +=
-@"
-        </Component>`r`n
-"@
-
-$wxsFile = $wxsFile -replace "\s+(<!--$($fileListName)_Component_Def-->)", $componentDefs
-
-$componentRef =
-@"
-        <ComponentRef Id="$($componentId)" />
-"@
-
-$wxsFile = $wxsFile -replace "\s+(</ComponentGroup>)", "$componentRef`r`n    </ComponentGroup>"
-
-Set-Content -Path $wxsFilePath -Value $wxsFile

installer/PowerToysSetup/generateFileList.ps1

@@ -1,62 +0,0 @@
-[CmdletBinding()]
-Param(
-    # Can be multiple files separated by ; as long as they're on the same directory
-    [Parameter(Mandatory = $True, Position = 1)]
-    [AllowEmptyString()]
-    [string]$fileDepsJson,
-    [Parameter(Mandatory = $True, Position = 2)]
-    [string]$fileListName,
-    [Parameter(Mandatory = $True, Position = 3)]
-    [string]$wxsFilePath,
-    # If there is no deps.json file, just pass path to files
-    [Parameter(Mandatory = $False, Position = 4)]
-    [string]$depsPath,
-    # launcher plugins are being loaded into launcher process,
-    # so there are some additional dependencies to skip
-    [Parameter(Mandatory = $False, Position = 5)]
-    [bool]$isLauncherPlugin
-)
-
-$fileWxs = Get-Content $wxsFilePath;
-
-$fileExclusionList = @("*.pdb", "*.lastcodeanalysissucceeded", "createdump.exe", "powertoys.exe")
-
-$fileInclusionList = @("*.dll", "*.exe", "*.json", "*.msix", "*.png", "*.gif", "*.ico", "*.cur", "*.svg", "index.html", "reg.js", "gitignore.js", "monacoSpecialLanguages.js", "customTokenColors.js", "*.pri")
-
-$dllsToIgnore = @("System.CodeDom.dll", "WindowsBase.dll")
-
-if ($fileDepsJson -eq [string]::Empty) {
-    $fileDepsRoot = $depsPath
-} else {
-    $multipleDepsJson = $fileDepsJson.Split(";")
-
-    foreach ( $singleDepsJson in $multipleDepsJson )
-    {
-
-        $fileDepsRoot = (Get-ChildItem $singleDepsJson).Directory.FullName
-        $depsJson = Get-Content $singleDepsJson | ConvertFrom-Json
-
-        $runtimeList = ([array]$depsJson.targets.PSObject.Properties)[-1].Value.PSObject.Properties | Where-Object {
-            $_.Name -match "runtimepack.*Runtime"
-        };
-
-        $runtimeList | ForEach-Object {
-            $_.Value.PSObject.Properties.Value | ForEach-Object {
-                $fileExclusionList += $_.PSObject.Properties.Name
-            }
-        }
-    }
-}
-
-$fileExclusionList = $fileExclusionList | Where-Object {$_ -notin $dllsToIgnore}
-
-if ($isLauncherPlugin -eq $True) {
-    $fileInclusionList += @("*.deps.json")
-    $fileExclusionList += @("Ijwhost.dll", "PowerToys.Common.UI.dll", "PowerToys.GPOWrapper.dll", "PowerToys.GPOWrapperProjection.dll", "PowerToys.PowerLauncher.Telemetry.dll", "PowerToys.ManagedCommon.dll", "PowerToys.Settings.UI.Lib.dll", "Wox.Infrastructure.dll", "Wox.Plugin.dll")
-}
-
-$fileList = Get-ChildItem $fileDepsRoot -Include $fileInclusionList -Exclude $fileExclusionList -File -Name
-
-$fileWxs = $fileWxs -replace "(<\?define $($fileListName)=)", "<?define $fileListName=$($fileList -join ';')"
-
-Set-Content -Path $wxsFilePath -Value $fileWxs

installer/PowerToysSetupCustomActions/CustomAction.cpp

@@ -357,7 +357,7 @@ UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
             ExitOnFailure(hr, "Unable to determine Powershell modules path");
         }
 
-        const auto modulesPath = baseModulesPath / L"Microsoft.PowerToys.Configure" / get_product_version(false);
+        const auto modulesPath = baseModulesPath / L"Microsoft.PowerToys.Configure" / (get_product_version(false) + L".0");
 
         std::error_code errorCode;
         fs::create_directories(modulesPath, errorCode);
@@ -411,7 +411,7 @@ UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)
         }
 
         const auto powerToysModulePath = baseModulesPath / L"Microsoft.PowerToys.Configure";
-        const auto versionedModulePath = powerToysModulePath / get_product_version(false);
+        const auto versionedModulePath = powerToysModulePath / (get_product_version(false) + L".0");
 
         std::error_code errorCode;
 
@@ -1148,7 +1148,7 @@ UINT __stdcall UnRegisterContextMenuPackagesCA(MSIHANDLE hInstall)
     try
     {
         // Packages to unregister
-        const std::vector<std::wstring> packagesToRemoveDisplayName{ { L"PowerRenameContextMenu" }, { L"ImageResizerContextMenu" }, { L"FileLocksmithContextMenu" } };
+        const std::vector<std::wstring> packagesToRemoveDisplayName{ { L"PowerRenameContextMenu" }, { L"ImageResizerContextMenu" }, { L"FileLocksmithContextMenu" }, { L"NewPlusContextMenu" } };
 
         PackageManager packageManager;
 
@@ -1223,7 +1223,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     }
     processes.resize(bytes / sizeof(processes[0]));
 
-    std::array<std::wstring_view, 32> processesToTerminate = {
+    std::array<std::wstring_view, 37> processesToTerminate = {
         L"PowerToys.PowerLauncher.exe",
         L"PowerToys.Settings.exe",
         L"PowerToys.AdvancedPaste.exe",
@@ -1255,6 +1255,11 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
         L"PowerToys.MouseWithoutBordersService.exe",
         L"PowerToys.CropAndLock.exe",
         L"PowerToys.EnvironmentVariables.exe",
+        L"PowerToys.WorkspacesSnapshotTool.exe",
+        L"PowerToys.WorkspacesLauncher.exe",
+        L"PowerToys.WorkspacesLauncherUI.exe",
+        L"PowerToys.WorkspacesEditor.exe",
+        L"PowerToys.WorkspacesWindowArranger.exe",
         L"PowerToys.exe",
     };
 

installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj

@@ -36,6 +36,9 @@
     <OutDir Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup\</OutDir>
     <IntDir Condition=" '$(PerUser)' != 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\MachineSetup\obj\</IntDir>
     <IntDir Condition=" '$(PerUser)' == 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\UserSetup\obj\</IntDir>
+    <!-- The CMD script below checks this value, and it is **CASE SENSITIVE** -->
+    <NormalizedPerUserValue>false</NormalizedPerUserValue>
+    <NormalizedPerUserValue Condition=" '$(PerUser)' == 'true' ">true</NormalizedPerUserValue>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <LinkIncremental>true</LinkIncremental>
@@ -60,6 +63,7 @@
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs"" ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs"" ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs"" ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\NewPlus.wxs"" ""$(ProjectDir)..\PowerToysSetup\NewPlus.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Peek.wxs"" ""$(ProjectDir)..\PowerToysSetup\Peek.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs"" ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Product.wxs"" ""$(ProjectDir)..\PowerToysSetup\Product.wxs.bk""""
@@ -72,8 +76,8 @@
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\VideoConference.wxs"" ""$(ProjectDir)..\PowerToysSetup\VideoConference.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\WinAppSDK.wxs"" ""$(ProjectDir)..\PowerToysSetup\WinAppSDK.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\WinUI3Applications.wxs"" ""$(ProjectDir)..\PowerToysSetup\WinUI3Applications.wxs.bk""""
-      if not "$(PerUser)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform)
-      if "$(PerUser)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform) -installscopeperuser $(PerUser)
+      if not "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform)
+      if "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform) -installscopeperuser $(NormalizedPerUserValue)
       </Command>
       <Message>Backing up original files and populating .NET and WPF Runtime dependencies </Message>
     </PreBuildEvent>

packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.271-preview" />
-  <package id="Microsoft.MSBuildCache.Local" version="0.1.271-preview" />
-  <package id="Microsoft.MSBuildCache.SharedCompilation" version="0.1.271-preview" />
+  <package id="Microsoft.MSBuildCache.AzurePipelines" version="0.1.283-preview" />
+  <package id="Microsoft.MSBuildCache.Local" version="0.1.283-preview" />
+  <package id="Microsoft.MSBuildCache.SharedCompilation" version="0.1.283-preview" />
 </packages>

src/Common.Dotnet.CsWinRT.props

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Some items may be set in Directory.Build.props in root -->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <WindowsSdkPackageVersion>10.0.22621.38</WindowsSdkPackageVersion>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
+    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
+    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
+  </PropertyGroup>
+
+  <!-- Common from the debug / release items -->
+  <PropertyGroup>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+    <WarningsNotAsErrors>CA1720</WarningsNotAsErrors>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <ErrorReport>prompt</ErrorReport>
+    <DefineConstants>RELEASE;TRACE</DefineConstants>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.CsWinRT" />
+  </ItemGroup>
+
+  <!-- this may need to be removed on future CsWinRT upgrades-->
+  <Target Name="RemoveCsWinRTPackageAnalyzer" BeforeTargets="CoreCompile">
+    <ItemGroup>
+      <Analyzer Remove="@(Analyzer)" Condition="%(Analyzer.NuGetPackageId) == 'Microsoft.Windows.CsWinRT'" />	  
+    </ItemGroup>
+  </Target>
+</Project>

src/Common.SelfContained.props

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Some items may be set in Directory.Build.props in root -->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+	<SelfContained>true</SelfContained>
+  </PropertyGroup>
+
+	<!-- SelfContained=true requires RuntimeIdentifier to be set -->
+  <PropertyGroup Condition="'$(Platform)'=='x64'">
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Platform)'=='ARM64'">
+    <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
+  </PropertyGroup>
+</Project>

src/common/AllExperiments/AllExperiments.csproj

@@ -1,16 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\Version.props" />
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
-    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TargetName>PowerToys.AllExperiments</TargetName>
     <MockDirectory>.\Microsoft.VariantAssignment\</MockDirectory>
   </PropertyGroup>
 
-  
   <ItemGroup>
     <ProjectReference Include="..\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
     <ProjectReference Include="..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />

src/common/AllExperiments/Experiments.cs

@@ -4,6 +4,7 @@
 
 using System.Globalization;
 using System.Text.Json;
+
 using Microsoft.PowerToys.Settings.UI.Library.Telemetry.Events;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.VariantAssignment.Client;

src/common/Common.UI/Common.UI.csproj

@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\Version.props" />
-  
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-	<RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
     <UseWPF>true</UseWPF>
     <AssemblyName>PowerToys.Common.UI</AssemblyName>
   </PropertyGroup>

src/common/Common.UI/SettingsDeepLink.cs

@@ -31,6 +31,7 @@ namespace Common.UI
             EnvironmentVariables,
             Dashboard,
             AdvancedPaste,
+            Workspaces,
         }
 
         private static string SettingsWindowNameToString(SettingsWindow value)
@@ -77,6 +78,8 @@ namespace Common.UI
                     return "Dashboard";
                 case SettingsWindow.AdvancedPaste:
                     return "AdvancedPaste";
+                case SettingsWindow.Workspaces:
+                    return "Workspaces";
                 default:
                     {
                         return string.Empty;

src/common/Common.UI/ThemeManager.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Linq;
 using System.Windows;
+
 using ManagedCommon;
 using Microsoft.Win32;
 

src/common/Display/Display.vcxproj

@@ -24,15 +24,18 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\common;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="DisplayUtils.h" />
+    <ClInclude Include="MonitorEnumerator.h" />
     <ClInclude Include="monitors.h" />
     <ClInclude Include="dpi_aware.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="DisplayUtils.cpp" />
     <ClCompile Include="monitors.cpp" />
     <ClCompile Include="dpi_aware.cpp" />
   </ItemGroup>

src/common/Display/DisplayUtils.cpp

@@ -0,0 +1,143 @@
+#include "DisplayUtils.h"
+
+#include <algorithm>
+#include <cwctype>
+#include <iterator>
+
+#include <dpi_aware.h>
+#include <MonitorEnumerator.h>
+
+#include <utils/OnThreadExecutor.h>
+
+namespace DisplayUtils
+{
+    std::wstring remove_non_digits(const std::wstring& input)
+    {
+        std::wstring result;
+        std::copy_if(input.begin(), input.end(), std::back_inserter(result), [](wchar_t ch) { return std::iswdigit(ch); });
+        return result;
+    }
+
+    std::pair<std::wstring, std::wstring> SplitDisplayDeviceId(const std::wstring& str) noexcept
+    {
+        // format:  \\?\DISPLAY#{device id}#{instance id}#{some other id}
+        // example: \\?\DISPLAY#GSM1388#4&125707d6&0&UID8388688#{e6f07b5f-ee97-4a90-b076-33f57bf4eaa7}
+        // output:  { GSM1388, 4&125707d6&0&UID8388688 }
+
+        size_t nameStartPos = str.find_first_of('#');
+        size_t uidStartPos = str.find('#', nameStartPos + 1);
+        size_t uidEndPos = str.find('#', uidStartPos + 1);
+
+        if (nameStartPos == std::string::npos || uidStartPos == std::string::npos || uidEndPos == std::string::npos)
+        {
+            return { str, L"" };
+        }
+
+        return { str.substr(nameStartPos + 1, uidStartPos - nameStartPos - 1), str.substr(uidStartPos + 1, uidEndPos - uidStartPos - 1) };
+    }
+
+    std::pair<bool, std::vector<DisplayUtils::DisplayData>> GetDisplays()
+    {
+        bool success = true;
+        std::vector<DisplayUtils::DisplayData> result{};
+        auto allMonitors = MonitorEnumerator::Enumerate();
+
+        OnThreadExecutor dpiUnawareThread;
+        dpiUnawareThread.submit(OnThreadExecutor::task_t{ [&] {
+            SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE);
+            SetThreadDpiHostingBehavior(DPI_HOSTING_BEHAVIOR_MIXED);
+        } }).wait();
+
+        for (auto& monitorData : allMonitors)
+        {
+            MONITORINFOEX monitorInfo = monitorData.second;
+            MONITORINFOEX dpiUnawareMonitorInfo{};
+
+            dpiUnawareThread.submit(OnThreadExecutor::task_t{ [&] {
+                dpiUnawareMonitorInfo.cbSize = sizeof(dpiUnawareMonitorInfo);
+                if (!GetMonitorInfo(monitorData.first, &dpiUnawareMonitorInfo))
+                {
+                    return;
+                }
+            } }).wait();
+
+            UINT dpi = 0;
+            if (DPIAware::GetScreenDPIForMonitor(monitorData.first, dpi) != S_OK)
+            {
+                success = false;
+                break;
+            }
+
+            DisplayUtils::DisplayData data{
+                .monitor = monitorData.first,
+                .dpi = dpi,
+                .monitorRectDpiAware = monitorInfo.rcMonitor,
+                .monitorRectDpiUnaware = dpiUnawareMonitorInfo.rcMonitor,
+            };
+
+            bool foundActiveMonitor = false;
+            DISPLAY_DEVICE displayDevice{ .cb = sizeof(displayDevice) };
+            DWORD displayDeviceIndex = 0;
+            while (EnumDisplayDevicesW(monitorInfo.szDevice, displayDeviceIndex, &displayDevice, EDD_GET_DEVICE_INTERFACE_NAME))
+            {
+                /* 
+                    * if (WI_IsFlagSet(displayDevice.StateFlags, DISPLAY_DEVICE_ACTIVE) &&
+                        WI_IsFlagClear(displayDevice.StateFlags, DISPLAY_DEVICE_MIRRORING_DRIVER))
+                    */
+                if (((displayDevice.StateFlags & DISPLAY_DEVICE_ACTIVE) == DISPLAY_DEVICE_ACTIVE) &&
+                    (displayDevice.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) == 0)
+                {
+                    // Find display devices associated with the display.
+                    foundActiveMonitor = true;
+                    break;
+                }
+
+                displayDeviceIndex++;
+            }
+
+            if (foundActiveMonitor)
+            {
+                auto deviceId = SplitDisplayDeviceId(displayDevice.DeviceID);
+                data.id = deviceId.first;
+                data.instanceId = deviceId.second;
+                try
+                {
+                    std::wstring numberStr = displayDevice.DeviceName; // \\.\DISPLAY1\Monitor0
+                    numberStr = numberStr.substr(0, numberStr.find_last_of('\\')); // \\.\DISPLAY1
+                    numberStr = remove_non_digits(numberStr);
+                    data.number = std::stoi(numberStr);
+                }
+                catch (...)
+                {
+                    success = false;
+                    break;
+                }
+            }
+            else
+            {
+                success = false;
+
+                // Use the display name as a fallback value when no proper device was found.
+                data.id = monitorInfo.szDevice;
+                data.instanceId = L"";
+
+                try
+                {
+                    std::wstring numberStr = monitorInfo.szDevice; // \\.\DISPLAY1
+                    numberStr = remove_non_digits(numberStr);
+                    data.number = std::stoi(numberStr);
+                }
+                catch (...)
+                {
+                    success = false;
+                    break;
+                }
+            }
+
+            result.push_back(data);
+        }
+
+        return { success, result };
+    }
+
+}

src/common/Display/DisplayUtils.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <Windows.h>
+#include <string>
+#include <vector>
+
+namespace DisplayUtils
+{
+    struct DisplayData
+    {
+        HMONITOR monitor{};
+        std::wstring id;
+        std::wstring instanceId;
+        unsigned int number{};
+        unsigned int dpi{};
+        RECT monitorRectDpiAware{};
+        RECT monitorRectDpiUnaware{};
+    };
+
+    std::pair<bool, std::vector<DisplayData>> GetDisplays();
+};

src/common/Display/MonitorEnumerator.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include <functional>
+#include <vector>
+#include <Windows.h>
+
+class MonitorEnumerator
+{
+public:
+	static std::vector<std::pair<HMONITOR, MONITORINFOEX>> Enumerate()
+	{
+		MonitorEnumerator inst;
+		EnumDisplayMonitors(NULL, NULL, Callback, reinterpret_cast<LPARAM>(&inst));
+		return inst.m_monitors;
+	}
+
+private:
+	MonitorEnumerator() = default;
+	~MonitorEnumerator() = default;
+
+	static BOOL CALLBACK Callback(HMONITOR monitor, HDC /*hdc*/, LPRECT /*pRect*/, LPARAM param)
+	{
+		MonitorEnumerator* inst = reinterpret_cast<MonitorEnumerator*>(param);
+		MONITORINFOEX mi;
+		mi.cbSize = sizeof(mi);
+		if (GetMonitorInfo(monitor, &mi))
+		{
+			inst->m_monitors.push_back({monitor, mi});
+		}
+
+		return TRUE;
+	}
+
+	std::vector<std::pair<HMONITOR, MONITORINFOEX>> m_monitors;
+};

src/common/Display/dpi_aware.cpp

@@ -1,7 +1,9 @@
 #include "dpi_aware.h"
+
 #include "monitors.h"
 #include <ShellScalingApi.h>
 #include <array>
+#include <cmath>
 
 namespace DPIAware
 {
@@ -60,6 +62,24 @@ namespace DPIAware
         }
     }
 
+    void Convert(HMONITOR monitor_handle, RECT& rect)
+    {
+        if (monitor_handle == NULL)
+        {
+            const POINT ptZero = { 0, 0 };
+            monitor_handle = MonitorFromPoint(ptZero, MONITOR_DEFAULTTOPRIMARY);
+        }
+
+        UINT dpi_x, dpi_y;
+        if (GetDpiForMonitor(monitor_handle, MDT_EFFECTIVE_DPI, &dpi_x, &dpi_y) == S_OK)
+        {
+            rect.left = static_cast<long>(std::round(rect.left * static_cast<float>(dpi_x) / DEFAULT_DPI));
+            rect.right = static_cast<long>(std::round(rect.right * static_cast<float>(dpi_x) / DEFAULT_DPI));
+            rect.top = static_cast<long>(std::round(rect.top * static_cast<float>(dpi_y) / DEFAULT_DPI));
+            rect.bottom = static_cast<long>(std::round(rect.bottom * static_cast<float>(dpi_y) / DEFAULT_DPI));
+        }
+    }
+
     void ConvertByCursorPosition(float& width, float& height)
     {
         HMONITOR targetMonitor = nullptr;

src/common/Display/dpi_aware.h

@@ -12,6 +12,7 @@ namespace DPIAware
     HRESULT GetScreenDPIForPoint(POINT p, UINT& dpi);
     HRESULT GetScreenDPIForCursor(UINT& dpi);
     void Convert(HMONITOR monitor_handle, float& width, float& height);
+    void Convert(HMONITOR monitor_handle, RECT& rect);
     void ConvertByCursorPosition(float& width, float& height);
     void InverseConvert(HMONITOR monitor_handle, float& width, float& height);
     void EnableDPIAwarenessForThisProcess();

src/common/FilePreviewCommon/Assets/Monaco/index.html

@@ -9,7 +9,7 @@
         // `theme` can be "vs" for light theme or "vs-dark" for dark theme
         // `lang` is the language of the file
         // `wrap` if the editor is wrapping or not
-        
+
         var theme = ("[[PT_THEME]]" == "dark") ? "vs-dark" : "vs";
         var lang = "[[PT_LANG]]";
         var wrap = ([[PT_WRAP]] == 1) ? true : false;
@@ -19,11 +19,29 @@
         var stickyScroll = ([[PT_STICKY_SCROLL]] == 1) ? true : false;
 
         var fontSize = [[PT_FONT_SIZE]];
-        
+        var contextMenu = ([[PT_CONTEXTMENU]] == 1) ? true : false;
+
+        var editor;
+
         // Code taken from https://stackoverflow.com/a/30106551/14774889
-        var code = decodeURIComponent(atob(base64code).split('').map(function(c) {
+        var code = decodeURIComponent(atob(base64code).split('').map(function (c) {
             return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
         }).join(''));
+
+        function runToggleTextWrapCommand() {
+            if (wrap) {
+                editor.updateOptions({ wordWrap: 'off' })
+            } else {
+                editor.updateOptions({ wordWrap: 'on' })
+            }
+            wrap = !wrap;
+        }
+
+        function runCopyCommand() {
+            editor.focus();
+            document.execCommand('copy');
+        }
+
     </script>
     <!-- Set browser to Edge-->
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
@@ -33,32 +51,33 @@
     <title>Previewer for developer Files</title>
     <style>
         /* Fits content to window size */
-        html, body{
-            padding:0;
+        html, body {
+            padding: 0;
         }
-        #container,.monaco-editor {
-            position:fixed;
-            height:100%;
-            left:0;
-            top:0;
-            right:0;
-            bottom:0;
+
+        #container, .monaco-editor {
+            position: fixed;
+            height: 100%;
+            left: 0;
+            top: 0;
+            right: 0;
+            bottom: 0;
         }
-        .overflowingContentWidgets{
+
+        .overflowingContentWidgets {
             /*Hides alert box */
-            display:none!important
-        } 
+            display: none !important
+        }
     </style>
 </head>
 
-<body oncontextmenu="onContextMenu()">
+<body>
     <!-- Container for the editor -->
     <div id="container"></div>
     <!-- Script -->
     <script src="http://[[PT_URL]]/monacoSRC/min/vs/loader.js"></script>
     <script src="http://[[PT_URL]]/monacoSpecialLanguages.js" type="module"></script>
-<script type="module">
-        var editor;
+    <script type="module">
         import { registerAdditionalLanguages } from 'http://[[PT_URL]]/monacoSpecialLanguages.js';
         import { customTokenColors } from 'http://[[PT_URL]]/customTokenColors.js';
         require.config({ paths: { vs: 'http://[[PT_URL]]/monacoSRC/min/vs' } });
@@ -80,8 +99,9 @@
                 language: lang, // Sets language of the code
                 readOnly: true, // Sets to readonly
                 theme: 'theme', // Sets editor theme
-                minimap: {enabled: false}, // Disables minimap
+                minimap: { enabled: false }, // Disables minimap
                 lineNumbersMinChars: '3', // Width of the line numbers
+                contextmenu: contextMenu,
                 scrollbar: {
                     // Deactivate shadows
                     shadows: false,
@@ -90,7 +110,7 @@
                     vertical: 'auto',
                     horizontal: 'auto',
                 },
-                stickyScroll: {enabled: stickyScroll},
+                stickyScroll: { enabled: stickyScroll },
                 fontSize: fontSize,
                 wordWrap: (wrap ? 'on' : 'off') // Word wraps
             });
@@ -117,12 +137,7 @@
                 // Method that will be executed when the action is triggered.
                 // @param editor The editor instance is passed in as a convenience
                 run: function (ed) {
-                    if (wrap) {
-                        editor.updateOptions({ wordWrap: 'off' })
-                    } else {
-                        editor.updateOptions({ wordWrap: 'on' })
-                    }
-                    wrap = !wrap;
+                    runToggleTextWrapCommand();
                 }
             });
 
@@ -151,4 +166,4 @@
         }
     </script>
 </body>
-</html>
+</html>

src/common/FilePreviewCommon/FilePreviewCommon.csproj

@@ -1,13 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\Version.props" />
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
-    <Version>$(Version).0</Version>
-    <Authors>Microsoft Corporation</Authors>
-    <Product>PowerToys</Product>
     <Description>PowerToys FilePreviewCommon</Description>
     <AssemblyName>PowerToys.FilePreviewCommon</AssemblyName>
     <UseWindowsForms>true</UseWindowsForms>

src/common/FilePreviewCommon/MarkdownHelper.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.IO;
+
 using Markdig;
 
 namespace Microsoft.PowerToys.FilePreviewCommon

src/common/FilePreviewCommon/MonacoHelper.cs

@@ -8,6 +8,7 @@ using System.Globalization;
 using System.IO;
 using System.Reflection;
 using System.Text.Json;
+
 using Microsoft.PowerToys.FilePreviewCommon.Monaco.Formatters;
 
 namespace Microsoft.PowerToys.FilePreviewCommon

src/common/GPOWrapper/GPOWrapper.cpp

@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
 #include "GPOWrapper.h"
 #include "GPOWrapper.g.cpp"
 
@@ -176,4 +176,52 @@ namespace winrt::PowerToys::GPOWrapper::implementation
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteOnlineAIModelsValue());
     }
+    GpoRuleConfigured GPOWrapper::GetConfiguredNewPlusEnabledValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredNewPlusEnabledValue());
+    }
+    GpoRuleConfigured GPOWrapper::GetConfiguredWorkspacesEnabledValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredWorkspacesEnabledValue());
+    }
+    GpoRuleConfigured GPOWrapper::GetConfiguredMwbClipboardSharingEnabledValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredMwbClipboardSharingEnabledValue());
+    }
+    GpoRuleConfigured GPOWrapper::GetConfiguredMwbFileTransferEnabledValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredMwbFileTransferEnabledValue());
+    }
+    GpoRuleConfigured GPOWrapper::GetConfiguredMwbUseOriginalUserInterfaceValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredMwbUseOriginalUserInterfaceValue());
+    }
+    GpoRuleConfigured GPOWrapper::GetConfiguredMwbDisallowBlockingScreensaverValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredMwbDisallowBlockingScreensaverValue());
+    }
+    GpoRuleConfigured GPOWrapper::GetConfiguredMwbSameSubnetOnlyValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredMwbSameSubnetOnlyValue());
+    }
+    GpoRuleConfigured GPOWrapper::GetConfiguredMwbValidateRemoteIpValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredMwbValidateRemoteIpValue());
+    }
+    GpoRuleConfigured GPOWrapper::GetConfiguredMwbDisableUserDefinedIpMappingRulesValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredMwbDisableUserDefinedIpMappingRulesValue());
+    }
+    winrt::hstring GPOWrapper::GetConfiguredMwbPolicyDefinedIpMappingRules()
+    {
+        // Assuming powertoys_gpo::getConfiguredMwbPolicyDefinedIpMappingRules() returns a std::wstring
+        std::wstring rules = powertoys_gpo::getConfiguredMwbPolicyDefinedIpMappingRules();
+
+        // Convert std::wstring to winrt::hstring
+        return to_hstring(rules.c_str());
+    }
+    GpoRuleConfigured GPOWrapper::GetConfiguredNewPlusHideTemplateFilenameExtensionValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredNewPlusHideTemplateFilenameExtensionValue());
+    }
 }

src/common/GPOWrapper/GPOWrapper.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include "GPOWrapper.g.h"
 #include <common/utils/gpo.h>
 
@@ -50,6 +50,17 @@ namespace winrt::PowerToys::GPOWrapper::implementation
         static GpoRuleConfigured GetConfiguredQoiPreviewEnabledValue();
         static GpoRuleConfigured GetConfiguredQoiThumbnailsEnabledValue();
         static GpoRuleConfigured GetAllowedAdvancedPasteOnlineAIModelsValue();
+        static GpoRuleConfigured GetConfiguredNewPlusEnabledValue();
+        static GpoRuleConfigured GetConfiguredWorkspacesEnabledValue();
+        static GpoRuleConfigured GetConfiguredMwbClipboardSharingEnabledValue();
+        static GpoRuleConfigured GetConfiguredMwbFileTransferEnabledValue();
+        static GpoRuleConfigured GetConfiguredMwbUseOriginalUserInterfaceValue();
+        static GpoRuleConfigured GetConfiguredMwbDisallowBlockingScreensaverValue();
+        static GpoRuleConfigured GetConfiguredMwbSameSubnetOnlyValue();
+        static GpoRuleConfigured GetConfiguredMwbValidateRemoteIpValue();
+        static GpoRuleConfigured GetConfiguredMwbDisableUserDefinedIpMappingRulesValue();
+        static winrt::hstring GPOWrapper::GetConfiguredMwbPolicyDefinedIpMappingRules();
+        static GpoRuleConfigured GetConfiguredNewPlusHideTemplateFilenameExtensionValue();
     };
 }
 

src/common/GPOWrapper/GPOWrapper.idl

@@ -54,6 +54,17 @@ namespace PowerToys
             static GpoRuleConfigured GetConfiguredQoiPreviewEnabledValue();
             static GpoRuleConfigured GetConfiguredQoiThumbnailsEnabledValue();
             static GpoRuleConfigured GetAllowedAdvancedPasteOnlineAIModelsValue();
+            static GpoRuleConfigured GetConfiguredNewPlusEnabledValue();
+            static GpoRuleConfigured GetConfiguredWorkspacesEnabledValue();
+            static GpoRuleConfigured GetConfiguredMwbClipboardSharingEnabledValue();
+            static GpoRuleConfigured GetConfiguredMwbFileTransferEnabledValue();
+            static GpoRuleConfigured GetConfiguredMwbUseOriginalUserInterfaceValue();
+            static GpoRuleConfigured GetConfiguredMwbDisallowBlockingScreensaverValue();
+            static GpoRuleConfigured GetConfiguredMwbSameSubnetOnlyValue();
+            static GpoRuleConfigured GetConfiguredMwbValidateRemoteIpValue();
+            static GpoRuleConfigured GetConfiguredMwbDisableUserDefinedIpMappingRulesValue();
+            static String GetConfiguredMwbPolicyDefinedIpMappingRules();
+            static GpoRuleConfigured GetConfiguredNewPlusHideTemplateFilenameExtensionValue();
         }
     }
 }

src/common/GPOWrapperProjection/GPOWrapper.cs

@@ -61,5 +61,10 @@ namespace PowerToys.GPOWrapperProjection
         {
             return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetRunPluginEnabledValue(pluginID);
         }
+
+        public static GpoRuleConfigured GetConfiguredWorkspacesEnabledValue()
+        {
+            return (GpoRuleConfigured)PowerToys.GPOWrapper.GPOWrapper.GetConfiguredWorkspacesEnabledValue();
+        }
     }
 }

src/common/GPOWrapperProjection/GPOWrapperProjection.csproj

@@ -1,9 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\Version.props" />
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.20348.0</TargetFramework>
-    <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-    <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <TargetName>PowerToys.GPOWrapperProjection</TargetName>
@@ -19,12 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\GPOWrapper\GPOWrapper.vcxproj">
-    </ProjectReference>
+    <ProjectReference Include="..\GPOWrapper\GPOWrapper.vcxproj" />
   </ItemGroup>
 
 </Project>

src/common/ManagedCommon/LanguageHelper.cs

@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.IO;
+using System.IO.Abstractions;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace ManagedCommon
+{
+    public static class LanguageHelper
+    {
+        public const string SettingsFilePath = "\\Microsoft\\PowerToys\\";
+        public const string SettingsFile = "language.json";
+
+        internal sealed class OutGoingLanguageSettings
+        {
+            [JsonPropertyName("language")]
+            public string LanguageTag { get; set; }
+        }
+
+        public static string LoadLanguage()
+        {
+            FileSystem fileSystem = new FileSystem();
+            var localAppDataDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            var file = localAppDataDir + SettingsFilePath + SettingsFile;
+
+            if (fileSystem.File.Exists(file))
+            {
+                try
+                {
+                    Stream inputStream = fileSystem.File.Open(file, FileMode.Open);
+                    StreamReader reader = new StreamReader(inputStream);
+                    string data = reader.ReadToEnd();
+                    inputStream.Close();
+                    reader.Dispose();
+
+                    return JsonSerializer.Deserialize<OutGoingLanguageSettings>(data).LanguageTag;
+                }
+                catch (Exception)
+                {
+                }
+            }
+
+            return string.Empty;
+        }
+    }
+}

src/common/ManagedCommon/Logger.cs

@@ -7,7 +7,8 @@ using System.Diagnostics;
 using System.Globalization;
 using System.IO.Abstractions;
 using System.Reflection;
-using interop;
+
+using PowerToys.Interop;
 
 namespace ManagedCommon
 {

src/common/ManagedCommon/ManagedCommon.csproj

@@ -1,17 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\Version.props" />
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
-    <Version>$(Version).0</Version>
-    <Authors>Microsoft Corporation</Authors>
-    <Product>PowerToys</Product>
     <Description>PowerToys ManagedCommon</Description>
     <AssemblyName>PowerToys.ManagedCommon</AssemblyName>
   </PropertyGroup>
 
+  <!-- See https://learn.microsoft.com/windows/apps/develop/platform/csharp-winrt/net-projection-from-cppwinrt-component for more info -->
+  <PropertyGroup>
+    <CsWinRTIncludes>PowerToys.Interop</CsWinRTIncludes>
+    <CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
+    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="System.IO.Abstractions" />
     <PackageReference Include="System.Management" />

src/common/ManagedCommon/ModuleType.cs

@@ -22,6 +22,7 @@ namespace ManagedCommon
         MouseJump,
         MousePointerCrosshairs,
         MouseWithoutBorders,
+        NewPlus,
         Peek,
         PowerRename,
         PowerLauncher,
@@ -30,5 +31,6 @@ namespace ManagedCommon
         MeasureTool,
         ShortcutGuide,
         PowerOCR,
+        Workspaces,
     }
 }

src/common/ManagedCommon/RunnerHelper.cs

@@ -6,6 +6,7 @@ using System;
 using System.Diagnostics;
 using System.Reflection;
 using System.Threading.Tasks;
+
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.PowerToys.Telemetry.Events;
 

src/common/ManagedCommon/ThemeHelpers.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Runtime.InteropServices;
+
 using Microsoft.Win32;
 
 namespace ManagedCommon

src/common/ManagedTelemetry/Telemetry/ManagedTelemetry.csproj

@@ -1,12 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="..\..\..\Version.props" />
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+	
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
-	<RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
-    <Version>$(Version).0</Version>
-    <Authors>Microsoft Corporation</Authors>
-    <Product>PowerToys</Product>
     <Description>PowerToys Telemetry</Description>
     <AssemblyName>PowerToys.ManagedTelemetry</AssemblyName>
   </PropertyGroup>

src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Tracing;
+
 using Microsoft.PowerToys.Telemetry.Events;
 
 namespace Microsoft.PowerToys.Telemetry

src/common/Themes/theme_helpers.cpp

@@ -3,13 +3,23 @@
 #include "dwmapi.h"
 #include <windows.h>
 #include <vector>
-#pragma comment (lib,"Dwmapi.lib")
+#pragma comment(lib, "Dwmapi.lib")
 
 #define DWMWA_USE_IMMERSIVE_DARK_MODE 20
 #define HKEY_WINDOWS_THEME L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"
 
 // based on https://stackoverflow.com/questions/51334674/how-to-detect-windows-10-light-dark-mode-in-win32-application
-AppTheme ThemeHelpers::GetAppTheme()
+Theme ThemeHelpers::GetAppTheme()
+{
+    return ThemeRegistryHelper(L"AppsUseLightTheme");
+}
+
+Theme ThemeHelpers::GetSystemTheme()
+{
+    return ThemeRegistryHelper(L"SystemUsesLightTheme");
+}
+
+Theme ThemeHelpers::ThemeRegistryHelper(LPCWSTR theme_key)
 {
     // The value is expected to be a REG_DWORD, which is a signed 32-bit little-endian
     auto buffer = std::vector<char>(4);
@@ -17,21 +27,22 @@ AppTheme ThemeHelpers::GetAppTheme()
     auto res = RegGetValueW(
         HKEY_CURRENT_USER,
         HKEY_WINDOWS_THEME,
-        L"AppsUseLightTheme",
-        RRF_RT_REG_DWORD, // expected value type
+        theme_key,
+        RRF_RT_REG_DWORD,
         nullptr,
         buffer.data(),
         &cbData);
 
     if (res != ERROR_SUCCESS)
     {
-        return AppTheme::Light;
+        // Defaulting to Light
+        return Theme::Light;
     }
 
     // convert bytes written to our buffer to an int, assuming little-endian
     auto i = static_cast<int>(buffer[3] << 24 | buffer[2] << 16 | buffer[1] << 8 | buffer[0]);
 
-    return AppTheme(i);
+    return Theme(i);
 }
 
 void ThemeHelpers::SetImmersiveDarkMode(HWND window, bool enabled)

src/common/Themes/theme_helpers.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <windows.h>
 
-enum class AppTheme
+enum class Theme
 {
     Dark = 0,
     Light = 1
@@ -9,6 +9,10 @@ enum class AppTheme
 
 struct ThemeHelpers
 {
-    static AppTheme GetAppTheme();
-    static void ThemeHelpers::SetImmersiveDarkMode(HWND window, bool enabled);
+    static Theme GetAppTheme();
+    static Theme GetSystemTheme();
+    static void SetImmersiveDarkMode(HWND window, bool enabled);
+
+protected:
+    static Theme ThemeRegistryHelper(LPCWSTR theme_key);
 };

src/common/Themes/theme_listener.h

@@ -22,7 +22,7 @@ public:
         dwThreadId = 0;
     }
 
-    AppTheme AppTheme;
+    Theme AppTheme;
     void ThemeListener::AddChangedHandler(THEME_HANDLE handle);
     void ThemeListener::DelChangedHandler(THEME_HANDLE handle);
     void CheckTheme();

src/common/Themes/windows_colors.cpp

@@ -66,7 +66,7 @@ WindowsColors::Color WindowsColors::get_background_color()
 
 bool WindowsColors::is_dark_mode()
 {
-    return ThemeHelpers::GetAppTheme() == AppTheme::Dark;
+    return ThemeHelpers::GetAppTheme() == Theme::Dark;
 }
 
 bool WindowsColors::update()

src/common/UnitTests-CommonLib/UnitTestsVersionHelper.cpp

@@ -58,6 +58,15 @@ namespace UnitTestsVersionHelper
             Assert::AreEqual(25ull, sut->minor);
             Assert::AreEqual(1ull, sut->revision);
         }
+        TEST_METHOD (stringConstructorShouldProperlyInitializationVersionNumbersWithUppercaseV)
+        {
+            auto sut = VersionHelper::fromString(L"V2.25.1");
+            Assert::IsTrue(sut.has_value());
+
+            Assert::AreEqual(2ull, sut->major);
+            Assert::AreEqual(25ull, sut->minor);
+            Assert::AreEqual(1ull, sut->revision);
+        }
         TEST_METHOD (emptyStringNotAccepted)
         {
             auto sut = VersionHelper::fromString("");

src/common/interop/CommonManaged.cpp

@@ -0,0 +1,39 @@
+#include "pch.h"
+#include "CommonManaged.h"
+#include "CommonManaged.g.cpp"
+#include <common/version/version.h>
+#include "../../modules/videoconference/VideoConferenceShared/MicrophoneDevice.h"
+#include "../../modules/videoconference/VideoConferenceShared/VideoCaptureDeviceList.h"
+
+namespace winrt::PowerToys::Interop::implementation
+{
+    hstring CommonManaged::GetProductVersion()
+    {
+        return hstring{ get_product_version() };
+    }
+    winrt::Windows::Foundation::Collections::IVector<hstring> CommonManaged::GetAllActiveMicrophoneDeviceNames()
+    {
+        auto names = std::vector<winrt::hstring>();
+        for (const auto& device : MicrophoneDevice::getAllActive())
+        {
+            names.push_back(device->name().data());
+        }
+        return winrt::multi_threaded_vector(std::move(names));
+    }
+    winrt::Windows::Foundation::Collections::IVector<hstring> CommonManaged::GetAllVideoCaptureDeviceNames()
+    {
+        auto names = std::vector<winrt::hstring>();
+        VideoCaptureDeviceList vcdl;
+        vcdl.EnumerateDevices();
+
+        for (UINT32 i = 0; i < vcdl.Count(); ++i)
+        {
+            auto name = vcdl.GetDeviceName(i).data();
+            if (name != L"PowerToys VideoConference Mute")
+            {
+                names.push_back(name);
+            }
+        }
+        return winrt::multi_threaded_vector(std::move(names));
+    }
+}

src/common/interop/CommonManaged.h

@@ -0,0 +1,20 @@
+#pragma once
+#include "CommonManaged.g.h"
+
+namespace winrt::PowerToys::Interop::implementation
+{
+    struct CommonManaged : CommonManagedT<CommonManaged>
+    {
+        CommonManaged() = default;
+
+        static hstring GetProductVersion();
+        static winrt::Windows::Foundation::Collections::IVector<hstring> GetAllActiveMicrophoneDeviceNames();
+        static winrt::Windows::Foundation::Collections::IVector<hstring> GetAllVideoCaptureDeviceNames();
+    };
+}
+namespace winrt::PowerToys::Interop::factory_implementation
+{
+    struct CommonManaged : CommonManagedT<CommonManaged, implementation::CommonManaged>
+    {
+    };
+}

src/common/interop/CommonManaged.idl

@@ -0,0 +1,11 @@
+namespace PowerToys
+{
+    namespace Interop
+    {
+        [default_interface] static runtimeclass CommonManaged {
+            static String GetProductVersion();
+            static Windows.Foundation.Collections.IVector<String> GetAllActiveMicrophoneDeviceNames();
+            static Windows.Foundation.Collections.IVector<String> GetAllVideoCaptureDeviceNames();
+        }
+    }
+}