Skip to content

Commit 9b798b3

Browse files
joexuejoexue
authored
Merge branch 'main' into tmux_cc_pr
2 parents 9372142 + 1980e72 commit 9b798b3

File tree

178 files changed

+8325
-1139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+8325
-1139
lines changed

‎.github/actions/spelling/allow/allow.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ dze
2424
dzhe
2525
Emacspeak
2626
Fitt
27-
FTCS
2827
flac
28+
FTCS
2929
gantt
3030
gfm
3131
ghe
@@ -61,8 +61,8 @@ Powerline
6161
ptys
6262
pwn
6363
pwshw
64-
QOL
6564
qof
65+
QOL
6666
qps
6767
quickfix
6868
rclt
@@ -82,6 +82,7 @@ stakeholders
8282
subpage
8383
sustainability
8484
sxn
85+
Tencent
8586
TLDR
8687
tonos
8788
toolset

‎.github/actions/spelling/excludes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,4 @@ Resources/(?!en)
133133
^\Qsrc/terminal/parser/ft_fuzzwrapper/run.bat\E$
134134
^\Qsrc/tools/lnkd/lnkd.bat\E$
135135
^\Qsrc/tools/pixels/pixels.bat\E$
136+
^\Qsrc/cascadia/ut_app/FzfTests.cpp\E$

‎.github/actions/spelling/expect/expect.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,7 @@ FONTSTRING
651651
FONTTYPE
652652
FONTWIDTH
653653
FONTWINDOW
654+
foob
654655
FORCEOFFFEEDBACK
655656
FORCEONFEEDBACK
656657
FRAMECHANGED
@@ -668,9 +669,11 @@ fuzzer
668669
fuzzmain
669670
fuzzmap
670671
fuzzwrapper
672+
fuzzyfinder
671673
fwdecl
672674
fwe
673675
fwlink
676+
fzf
674677
gci
675678
gcx
676679
gdi
@@ -1248,6 +1251,7 @@ onecoreuuid
12481251
ONECOREWINDOWS
12491252
onehalf
12501253
oneseq
1254+
oob
12511255
openbash
12521256
opencode
12531257
opencon

‎.github/workflows/winget.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66

77
env:
88
REGEX: 'Microsoft\.WindowsTerminal(?:Preview)?_([\d.]+)_8wekyb3d8bbwe\.msixbundle$'
9+
# winget-create will read the following environment variable to access the GitHub token needed for submitting a PR
10+
# See https://aka.ms/winget-create-token
11+
WINGET_CREATE_GITHUB_TOKEN: ${{ secrets.WINGET_TOKEN }}
912

1013
jobs:
1114
publish:
@@ -21,4 +24,4 @@ jobs:
2124
$wingetPackage = "Microsoft.WindowsTerminal${{ github.event.release.prerelease && '.Preview' || '' }}"
2225
2326
& curl.exe -JLO https://aka.ms/wingetcreate/latest
24-
& .\wingetcreate.exe update $wingetPackage -s -v $version -u $wingetRelevantAsset.browser_download_url -t "${{ secrets.WINGET_TOKEN }}"
27+
& .\wingetcreate.exe update $wingetPackage -s -v $version -u $wingetRelevantAsset.browser_download_url

‎NOTICE.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,8 @@ specific language governing permissions and limitations under the License.
285285
**Source**: [https://github.com/commonmark/cmark](https://github.com/commonmark/cmark)
286286

287287
### License
288+
289+
```
288290
Copyright (c) 2014, John MacFarlane
289291
290292
All rights reserved.
@@ -455,6 +457,36 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
455457
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
456458
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
457459
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
460+
```
461+
462+
## fzf
463+
464+
### License
465+
466+
```
467+
The MIT License (MIT)
468+
469+
Copyright (c) 2013-2024 Junegunn Choi
470+
Copyright (c) 2021-2025 Simon Hauser
471+
472+
Permission is hereby granted, free of charge, to any person obtaining a copy
473+
of this software and associated documentation files (the "Software"), to deal
474+
in the Software without restriction, including without limitation the rights
475+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
476+
copies of the Software, and to permit persons to whom the Software is
477+
furnished to do so, subject to the following conditions:
478+
479+
The above copyright notice and this permission notice shall be included in
480+
all copies or substantial portions of the Software.
481+
482+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
483+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
484+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
485+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
486+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
487+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
488+
THE SOFTWARE.
489+
```
458490

459491
# Microsoft Open Source
460492

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
pwsh: true
6262
ScriptType: InlineScript
6363
Inline: |-
64-
$AzToken = (Get-AzAccessToken -ResourceUrl api://30471ccf-0966-45b9-a979-065dbedb24c1).Token
64+
$AzToken = (Get-AzAccessToken -AsSecureString -ResourceUrl api://30471ccf-0966-45b9-a979-065dbedb24c1).Token | ConvertFrom-SecureString -AsPlainText
6565
Write-Host "##vso[task.setvariable variable=SymbolAccessToken;issecret=true]$AzToken"
6666
6767

‎build/scripts/Set-LatestVCToolsVersion.ps1

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,28 @@
11
$VSInstances = ([xml](& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -include packages -format xml))
22
$VSPackages = $VSInstances.instances.instance.packages.package
3-
$LatestVCPackage = ($VSInstances.instances.instance.packages.package | ? { $_.id -eq "Microsoft.VisualCpp.Tools.Core" })
3+
$LatestVCPackage = ($VSPackages | ? { $_.id -eq "Microsoft.VisualCpp.Tools.Core" })
44
$LatestVCToolsVersion = $LatestVCPackage.version;
55

6+
$VSRoot = (& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property 'resolvedInstallationPath')
7+
$VCToolsRoot = Join-Path $VSRoot "VC\Tools\MSVC"
8+
9+
# We have observed a few instances where the VC tools package version actually
10+
# differs from the version on the files themselves. We might as well check
11+
# whether the version we just found _actually exists_ before we use it.
12+
# We'll use whichever highest version exists.
13+
$PackageVCToolPath = Join-Path $VCToolsRoot $LatestVCToolsVersion
14+
If ($Null -Eq (Get-Item $PackageVCToolPath -ErrorAction:Ignore)) {
15+
$VCToolsVersions = Get-ChildItem $VCToolsRoot | ForEach-Object {
16+
[Version]$_.Name
17+
} | Sort -Descending
18+
$LatestActualVCToolsVersion = $VCToolsVersions | Select -First 1
19+
20+
If ([Version]$LatestVCToolsVersion -Ne $LatestActualVCToolsVersion) {
21+
Write-Output "VC Tools Mismatch: Directory = $LatestActualVCToolsVersion, Package = $LatestVCToolsVersion"
22+
$LatestVCToolsVersion = $LatestActualVCToolsVersion.ToString(3)
23+
}
24+
}
25+
626
Write-Output "Latest VCToolsVersion: $LatestVCToolsVersion"
727
Write-Output "Updating VCToolsVersion environment variable for job"
828
Write-Output "##vso[task.setvariable variable=VCToolsVersion]$LatestVCToolsVersion"

‎dep/vcpkg-overlay-triplets/fuzzing/arm64-windows-static.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
set(VCPKG_TARGET_ARCHITECTURE arm64)
2+
set(VCPKG_CRT_LINKAGE static)
3+
set(VCPKG_LIBRARY_LINKAGE static)
4+
5+
set(VCPKG_CXX_FLAGS /fsanitize=address)
6+
set(VCPKG_C_FLAGS /fsanitize=address)

‎dep/vcpkg-overlay-triplets/fuzzing/x64-windows-static.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
set(VCPKG_TARGET_ARCHITECTURE x64)
2+
set(VCPKG_CRT_LINKAGE static)
3+
set(VCPKG_LIBRARY_LINKAGE static)
4+
5+
set(VCPKG_CXX_FLAGS /fsanitize=address)
6+
set(VCPKG_C_FLAGS /fsanitize=address)

‎dep/vcpkg-overlay-triplets/fuzzing/x86-windows-static.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
set(VCPKG_TARGET_ARCHITECTURE x86)
2+
set(VCPKG_CRT_LINKAGE static)
3+
set(VCPKG_LIBRARY_LINKAGE static)
4+
5+
set(VCPKG_CXX_FLAGS /fsanitize=address)
6+
set(VCPKG_C_FLAGS /fsanitize=address)

0 commit comments

Comments
 (0)