Skip to content

Commit 57e1f26

Browse files
zadjii-msftzadjii-msft
committed
Merge branch 'dev/migrie/fhl/scratchpad-pane' into dev/migrie/f/sui-panes
2 parents 6107c3e + b49997b commit 57e1f26

File tree

190 files changed

+5077
-1977
lines changed

Some content is hidden

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

190 files changed

+5077
-1977
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ clickable
1313
clig
1414
CMMI
1515
copyable
16+
Counterintuitively
1617
CtrlDToClose
1718
cybersecurity
1819
dalet
@@ -94,6 +95,7 @@ shcha
9495
slnt
9596
Sos
9697
ssh
98+
sustainability
9799
stakeholders
98100
sxn
99101
timeline

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

+4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ CYICON
2828
Dacl
2929
dataobject
3030
dcomp
31+
debugbreak
3132
delayimp
3233
DERR
3334
dlldata
@@ -219,16 +220,19 @@ UFIELD
219220
ULARGE
220221
UOI
221222
UPDATEINIFILE
223+
urlmon
222224
userenv
223225
USEROBJECTFLAGS
224226
Vcpp
225227
Viewbox
226228
virtualalloc
227229
vsnwprintf
230+
wcsnlen
228231
wcsstr
229232
wcstoui
230233
WDJ
231234
winhttp
235+
wininet
232236
winmain
233237
winsta
234238
winstamin

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ advapi
44
altform
55
altforms
66
appendwttlogging
7+
appinstaller
78
appx
89
appxbundle
910
appxerror
@@ -59,12 +60,13 @@ PRIINFO
5960
propkey
6061
pscustomobject
6162
QWORD
63+
rdpclip
6264
regedit
6365
resfiles
6466
robocopy
6567
SACLs
66-
segoe
6768
sdkddkver
69+
segoe
6870
Shobjidl
6971
sid
7072
Skype

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

+4-7
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,10 @@ changelist
188188
chaof
189189
charinfo
190190
CHARSETINFO
191+
chcbpat
191192
chh
192193
chk
194+
chshdng
193195
CHT
194196
Cic
195197
cielab
@@ -749,7 +751,6 @@ gfx
749751
GGI
750752
GHIJK
751753
GHIJKL
752-
GHIJKLM
753754
gitfilters
754755
gitmodules
755756
gle
@@ -1000,7 +1001,6 @@ listptrsize
10001001
lld
10011002
llx
10021003
LMENU
1003-
LMNOP
10041004
lnk
10051005
lnkd
10061006
lnkfile
@@ -1223,7 +1223,6 @@ nonspace
12231223
NOOWNERZORDER
12241224
Nop
12251225
NOPAINT
1226-
NOPQRST
12271226
noprofile
12281227
NOREDRAW
12291228
NOREMOVE
@@ -1498,7 +1497,6 @@ pwsz
14981497
pythonw
14991498
Qaabbcc
15001499
qos
1501-
QRSTU
15021500
QUERYOPEN
15031501
QUESTIONMARK
15041502
quickedit
@@ -1861,7 +1859,6 @@ testname
18611859
TESTNULL
18621860
testpass
18631861
testpasses
1864-
testtimeout
18651862
TEXCOORD
18661863
texel
18671864
TExpected
@@ -1908,6 +1905,7 @@ touchpad
19081905
Tpp
19091906
Tpqrst
19101907
tprivapi
1908+
tput
19111909
tracelog
19121910
tracelogging
19131911
traceloggingprovider
@@ -2018,7 +2016,6 @@ utext
20182016
UText
20192017
UTEXT
20202018
utr
2021-
UVWX
20222019
UVWXY
20232020
UVWXYZ
20242021
uwa
@@ -2077,7 +2074,6 @@ VTRGBTo
20772074
vtseq
20782075
vtterm
20792076
vttest
2080-
VWX
20812077
waitable
20822078
WANSUNG
20832079
WANTARROWS
@@ -2273,6 +2269,7 @@ YCast
22732269
YCENTER
22742270
YCount
22752271
YDPI
2272+
YLimit
22762273
YOffset
22772274
YSubstantial
22782275
YVIRTUALSCREEN

‎OpenConsole.sln

+1-32
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{89CDCC
239239
EndProject
240240
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Types.Unit.Tests", "src\types\ut_types\Types.Unit.Tests.vcxproj", "{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73}"
241241
EndProject
242-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PublicTerminalCore", "src\cascadia\PublicTerminalCore\PublicTerminalCore.vcxproj", "{84848BFA-931D-42CE-9ADF-01EE54DE7890}"
243-
EndProject
244242
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalControl", "src\cascadia\WpfTerminalControl\WpfTerminalControl.csproj", "{376FE273-6B84-4EB5-8B30-8DE9D21B022C}"
245243
EndProject
246244
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_TerminalApp", "src\cascadia\ut_app\TerminalApp.UnitTests.vcxproj", "{CA5CAD1A-9333-4D05-B12A-1905CBF112F9}"
@@ -334,7 +332,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "src\dep\fmt\fmt.vcxp
334332
EndProject
335333
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalTestNetCore", "src\cascadia\WpfTerminalTestNetCore\WpfTerminalTestNetCore.csproj", "{1588FD7C-241E-4E7D-9113-43735F3E6BAD}"
336334
ProjectSection(ProjectDependencies) = postProject
337-
{84848BFA-931D-42CE-9ADF-01EE54DE7890} = {84848BFA-931D-42CE-9ADF-01EE54DE7890}
335+
{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
338336
{A22EC5F6-7851-4B88-AC52-47249D437A52} = {A22EC5F6-7851-4B88-AC52-47249D437A52}
339337
EndProjectSection
340338
EndProject
@@ -1711,34 +1709,6 @@ Global
17111709
{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73}.Release|x64.Build.0 = Release|x64
17121710
{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73}.Release|x86.ActiveCfg = Release|Win32
17131711
{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73}.Release|x86.Build.0 = Release|Win32
1714-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
1715-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|ARM.ActiveCfg = AuditMode|Win32
1716-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
1717-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|x64.ActiveCfg = AuditMode|x64
1718-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|x64.Build.0 = AuditMode|x64
1719-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|x86.ActiveCfg = AuditMode|Win32
1720-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|x86.Build.0 = AuditMode|Win32
1721-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|Any CPU.ActiveCfg = Debug|Win32
1722-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|ARM.ActiveCfg = Debug|Win32
1723-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|ARM64.ActiveCfg = Debug|ARM64
1724-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|ARM64.Build.0 = Debug|ARM64
1725-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|x64.ActiveCfg = Debug|x64
1726-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|x64.Build.0 = Debug|x64
1727-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|x86.ActiveCfg = Debug|Win32
1728-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|x86.Build.0 = Debug|Win32
1729-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
1730-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Fuzzing|ARM.ActiveCfg = Fuzzing|Win32
1731-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
1732-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
1733-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
1734-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|Any CPU.ActiveCfg = Release|Win32
1735-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|ARM.ActiveCfg = Release|Win32
1736-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|ARM64.ActiveCfg = Release|ARM64
1737-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|ARM64.Build.0 = Release|ARM64
1738-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|x64.ActiveCfg = Release|x64
1739-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|x64.Build.0 = Release|x64
1740-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|x86.ActiveCfg = Release|Win32
1741-
{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|x86.Build.0 = Release|Win32
17421712
{376FE273-6B84-4EB5-8B30-8DE9D21B022C}.AuditMode|Any CPU.ActiveCfg = Release|Any CPU
17431713
{376FE273-6B84-4EB5-8B30-8DE9D21B022C}.AuditMode|ARM.ActiveCfg = Debug|Any CPU
17441714
{376FE273-6B84-4EB5-8B30-8DE9D21B022C}.AuditMode|ARM.Build.0 = Debug|Any CPU
@@ -2894,7 +2864,6 @@ Global
28942864
{05500DEF-2294-41E3-AF9A-24E580B82836} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
28952865
{1E4A062E-293B-4817-B20D-BF16B979E350} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
28962866
{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
2897-
{84848BFA-931D-42CE-9ADF-01EE54DE7890} = {4DAF0299-495E-4CD1-A982-9BAC16A45932}
28982867
{376FE273-6B84-4EB5-8B30-8DE9D21B022C} = {4DAF0299-495E-4CD1-A982-9BAC16A45932}
28992868
{CA5CAD1A-9333-4D05-B12A-1905CBF112F9} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
29002869
{CA5CAD1A-9A12-429C-B551-8562EC954746} = {59840756-302F-44DF-AA47-441A9D673202}

‎README.md

+23-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![terminal-logos](https://user-images.githubusercontent.com/48369326/115790869-4c852b00-a37c-11eb-97f1-f61972c7800c.png)
1+
![terminal-logos](https://github.com/microsoft/terminal/assets/91625426/333ddc76-8ab2-4eb4-a8c0-4d7b953b1179)
22

33
# Welcome to the Windows Terminal, Console and Command-Line repo
44

@@ -118,6 +118,28 @@ repository.
118118

119119
---
120120

121+
## Installing Windows Terminal Canary
122+
Windows Terminal Canary is a nightly build of Windows Terminal. This build has the latest code from our `main` branch, giving you an opportunity to try features before they make it to Windows Terminal Preview.
123+
124+
Windows Terminal Canary is our least stable offering, so you may discover bugs before we have had a chance to find them.
125+
126+
Windows Terminal Canary is available as an App Installer distribution and a Portable ZIP distribution.
127+
128+
The App Installer distribution supports automatic updates. Due to platform limitations, this installer only works on Windows 11.
129+
130+
The Portable ZIP distribution is a portable application. It will not automatically update and will not automatically check for updates. This portable ZIP distribution works on Windows 10 (19041+) and Windows 11.
131+
132+
| Distribution | Architecture | Link |
133+
|---------------|:---------------:|------------------------------------------------------|
134+
| App Installer | x64, arm64, x86 | [download](https://aka.ms/terminal-canary-installer) |
135+
| Portable ZIP | x64 | [download](https://aka.ms/terminal-canary-zip-x64) |
136+
| Portable ZIP | ARM64 | [download](https://aka.ms/terminal-canary-zip-arm64) |
137+
| Portable ZIP | x86 | [download](https://aka.ms/terminal-canary-zip-x86) |
138+
139+
_Learn more about the [types of Windows Terminal distributions](https://learn.microsoft.com/windows/terminal/distributions)._
140+
141+
---
142+
121143
## Windows Terminal Roadmap
122144

123145
The plan for the Windows Terminal [is described here](/doc/roadmap-2023.md) and

‎build/config/esrp.build.batch.wpf.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"MatchedPath": [
4-
"PublicTerminalCore.dll"
4+
"Microsoft.Terminal.Control/Microsoft.Terminal.Control.dll"
55
],
66
"SigningInfo": {
77
"Operations": [

0 commit comments

Comments
 (0)