Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Keep the grid top-anchored when growing on Windows (#63699)

Ali62e5991dd0f0
diff --git a/crates/zed/build.rs b/crates/zed/build.rs
index f49396a5a2c..92407a37911 100644
--- a/crates/zed/build.rs
+++ b/crates/zed/build.rs
@@ -102,7 +102,8 @@ fn main() {
let conpty_dll_target = target_dir.join("conpty.dll");
let open_console_target = target_dir.join("OpenConsole.exe");
- let conpty_url = "https://github.com/microsoft/terminal/releases/download/v1.24.10621.0/Microsoft.Windows.Console.ConPTY.1.24.260303001.nupkg";
+ // TODO: Switch back to the stable channel once Microsoft finally decides to publish v1.26
+ let conpty_url = "https://github.com/microsoft/terminal/releases/download/v1.25.1912.0/Microsoft.Windows.Console.ConPTY.1.25.260710002-preview.nupkg";
let nupkg_path = out_dir.join("conpty.nupkg.zip");
let extract_dir = out_dir.join("conpty");
diff --git a/script/bundle-windows.ps1 b/script/bundle-windows.ps1
index 786f07922bf..d9cf2e37d1e 100644
--- a/script/bundle-windows.ps1
+++ b/script/bundle-windows.ps1
@@ -233,8 +233,9 @@ function DownloadAMDGpuServices {
}
function DownloadConpty {
- $url = "https://github.com/microsoft/terminal/releases/download/v1.23.13503.0/Microsoft.Windows.Console.ConPTY.1.23.251216003.nupkg"
- $zipPath = ".\Microsoft.Windows.Console.ConPTY.1.23.251216003.nupkg"
+ # TODO: Switch back to the stable channel once Microsoft finally decides to publish v1.26
+ $url = "https://github.com/microsoft/terminal/releases/download/v1.25.1912.0/Microsoft.Windows.Console.ConPTY.1.25.260710002-preview.nupkg"
+ $zipPath = ".\Microsoft.Windows.Console.ConPTY.1.25.260710002-preview.nupkg"
Invoke-WebRequest -Uri $url -OutFile $zipPath
Expand-Archive -Path $zipPath -DestinationPath ".\conpty" -Force
}