Skip to content

Commit beef806

Browse files
authored
Merge branch 'microsoft:main' into fix-scrolling-bug
2 parents 4521bba + 4b946c0 commit beef806

File tree

55 files changed

+5612
-569
lines changed

Some content is hidden

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

55 files changed

+5612
-569
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ftcs

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,6 @@ EPres
540540
EQU
541541
ERASEBKGND
542542
ERRORONEXIT
543-
ESFCIB
544543
esrp
545544
ESV
546545
ETW
@@ -603,7 +602,6 @@ FONTSTRING
603602
FONTTYPE
604603
FONTWIDTH
605604
FONTWINDOW
606-
foob
607605
FORCEOFFFEEDBACK
608606
FORCEONFEEDBACK
609607
FRAMECHANGED
@@ -620,7 +618,6 @@ FUNCTIONCALL
620618
fuzzmain
621619
fuzzmap
622620
fuzzwrapper
623-
fuzzyfinder
624621
fwdecl
625622
fwe
626623
fwlink
@@ -961,7 +958,6 @@ lsb
961958
lsconfig
962959
lstatus
963960
lstrcmp
964-
lstrcmpi
965961
LTEXT
966962
lto
967963
ltsc
@@ -1125,7 +1121,6 @@ NOREPOSITION
11251121
NORMALDISPLAY
11261122
NOSCRATCH
11271123
NOSEARCH
1128-
noselect
11291124
NOSELECTION
11301125
NOSENDCHANGING
11311126
NOSIZE
@@ -1183,7 +1178,6 @@ onecoreuuid
11831178
ONECOREWINDOWS
11841179
onehalf
11851180
oneseq
1186-
oob
11871181
openbash
11881182
opencode
11891183
opencon

OpenConsole.slnx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -723,16 +723,6 @@
723723
<Build Solution="Fuzzing|x64" Project="false" />
724724
<Build Solution="Fuzzing|x86" Project="false" />
725725
</Project>
726-
<Project Path="src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj" Id="067f0a06-fcb7-472c-96e9-b03b54e8e18d">
727-
<BuildDependency Project="src/cascadia/TerminalConnection/TerminalConnection.vcxproj" />
728-
<BuildType Solution="AuditMode|x64" Project="Release" />
729-
<Platform Solution="*|Any CPU" Project="Win32" />
730-
<Build Solution="*|Any CPU" Project="false" />
731-
<Build Solution="AuditMode|x64" Project="false" />
732-
<Build Solution="Fuzzing|ARM64" Project="false" />
733-
<Build Solution="Fuzzing|x64" Project="false" />
734-
<Build Solution="Fuzzing|x86" Project="false" />
735-
</Project>
736726
<Project Path="src/cascadia/UIHelpers/UIHelpers.vcxproj" Id="6515f03f-e56d-4db4-b23d-ac4fb80db36f">
737727
<Build Solution="*|Any CPU" Project="false" />
738728
<Build Solution="AuditMode|ARM64" Project="false" />

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,10 @@ The Portable ZIP distribution is a portable application. It will not automatical
169169

170170
| Distribution | Architecture | Link |
171171
|---------------|:---------------:|------------------------------------------------------|
172-
| App Installer | x64, arm64, x86 | [download](https://aka.ms/terminal-canary-installer) |
173-
| Portable ZIP | x64 | [download](https://aka.ms/terminal-canary-zip-x64) |
174-
| Portable ZIP | ARM64 | [download](https://aka.ms/terminal-canary-zip-arm64) |
175-
| Portable ZIP | x86 | [download](https://aka.ms/terminal-canary-zip-x86) |
172+
| App Installer | x64, arm64, x86 | [Download](https://aka.ms/terminal-canary-installer) |
173+
| Portable ZIP | x64 | [Download](https://aka.ms/terminal-canary-zip-x64) |
174+
| Portable ZIP | ARM64 | [Download](https://aka.ms/terminal-canary-zip-arm64) |
175+
| Portable ZIP | x86 | [Download](https://aka.ms/terminal-canary-zip-x86) |
176176

177177
_Learn more about the [types of Windows Terminal distributions](https://learn.microsoft.com/windows/terminal/distributions)._
178178

build/config/esrp.build.batch.terminal_constituents.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"PackageContents/WindowsTerminalShellExt.dll",
1818

1919
// The rest
20-
"PackageContents/TerminalAzBridge.exe",
2120
"PackageContents/wt.exe",
2221
"PackageContents/WindowsTerminal.exe",
2322
"PackageContents/elevate-shim.exe"

build/pipelines/daily-loc-submission.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ parameters:
2323
default: true
2424

2525
pool:
26-
vmImage: windows-2019
26+
vmImage: windows-latest
2727

2828
resources:
2929
repositories:

build/pipelines/feature-flag-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ stages:
3131
- template: ./templates-v2/job-build-project.yml
3232
parameters:
3333
pool: # This only runs in CI
34-
name: SHINE-OSS-L
34+
name: SHINE-OSS-L
3535
buildPlatforms: [x64]
3636
buildConfigurations: [Release]
3737
buildEverything: true

build/pipelines/pgo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ stages:
7474
parameters:
7575
jobName: MergePGD
7676
pool:
77-
vmImage: 'windows-2022'
77+
vmImage: 'windows-latest'
7878
buildConfiguration: Release
7979
buildPlatforms: ${{ parameters.buildPlatforms }}
8080
artifactStem: -instrumentation
8181

8282
- template: ./templates-v2/job-pgo-build-nuget-and-publish.yml
8383
parameters:
8484
pool:
85-
vmImage: 'windows-2022'
85+
vmImage: 'windows-latest'
8686
dependsOn: MergePGD
8787
buildConfiguration: Release
8888
artifactStem: -instrumentation

build/pipelines/templates-v2/job-check-code-format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
jobs:
22
- job: CodeFormatCheck
33
displayName: Check Code Format
4-
pool: { vmImage: windows-2022 }
4+
pool: { vmImage: windows-latest }
55

66
steps:
77
- checkout: self

doc/specs/#11000 - Marks/Shell-Integration-Marks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ not understanding these sequences originally.
111111
The relevant FinalTerm sequences for marking up the prompt are as follows.
112112

113113

114-
![image](FTCS-diagram.png)
114+
![image](ftcs-diagram.png)
115115

116116
* **FTCS_PROMPT**: `OSC 133 ; A ST`
117117
- The start of a prompt. Internally, this sets a marker in the buffer

0 commit comments

Comments
 (0)