Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wire up passing LNK/EXE data from OpenCon to ITerminalHandoff #13570

Merged
merged 20 commits into from
Aug 26, 2022

Conversation

zadjii-msft
Copy link
Member

This PR by itself doesn't really change much. Technically, now the Terminal will respect the Title of a .lnk when started for defterm, but we don't do anything else yet. Primarily, the goal of this PR is to just wire up startup info in OpenConsole to the connected Terminal.

@ghost ghost added Area-DefApp Area-Server Down in the muck of API call servicing, interprocess communication, eventing, etc. Issue-Task It's a feature request, but it doesn't really need a major design. Product-Terminal The new Windows Terminal. labels Jul 22, 2022
@github-actions

This comment has been minimized.

@zadjii-msft
Copy link
Member Author

hey look, this made this better:
image

@DHowett
Copy link
Member

DHowett commented Aug 12, 2022

hey look, this made this better

helk yeah

<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.1\build\native\Microsoft.UI.Xaml.targets')" />
<Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
<!-- This -must- go after cppwinrt.build.post.props because that includes many VS-provided props including appcontainer.common.props, which stomps on what cppwinrt.targets did. -->
<Import Project="$(OpenConsoleDir)src\common.nugetversions.targets" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this project becomes less sampley every day!

src/cascadia/TerminalConnection/ConptyConnection.cpp Outdated Show resolved Hide resolved
src/host/proxy/ITerminalHandoff.idl Outdated Show resolved Hide resolved
src/host/proxy/ITerminalHandoff.idl Outdated Show resolved Hide resolved
@ghost ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Aug 12, 2022
@ghost ghost removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Aug 19, 2022
@zadjii-msft
Copy link
Member Author

Yo @DHowett I did run this with appverifier and this ran clean 😄

Copy link
Member

@DHowett DHowett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perfect

@DHowett
Copy link
Member

DHowett commented Aug 25, 2022

@msftbot make sure @DHowett-MSFT signs off

@ghost ghost added the AutoMerge Marked for automatic merge by the bot when requirements are met label Aug 25, 2022
@DHowett
Copy link
Member

DHowett commented Aug 25, 2022

This will never be true. It will not clear this status, so you'll have to manually merge it. :)

@microsoft microsoft deleted a comment Aug 25, 2022
@zadjii-msft zadjii-msft merged commit 7e47f6a into main Aug 26, 2022
@ghost
Copy link

ghost commented Sep 13, 2022

🎉Windows Terminal Preview v1.16.252 has been released which incorporates this pull request.:tada:

Handy links:

@DHowett DHowett added this to To Cherry Pick in 1.15 Servicing Pipeline via automation Oct 14, 2022
@DHowett DHowett moved this from To Cherry Pick to Cherry Picked in 1.15 Servicing Pipeline Oct 14, 2022
DHowett pushed a commit that referenced this pull request Oct 14, 2022
This PR by itself doesn't _really_ change much. Technically, now the Terminal will respect the Title of a `.lnk` when started for defterm, but we don't do anything else yet. Primarily, the goal of this PR is to just wire up startup info in OpenConsole to the connected Terminal.
* This required a bit of changes in `srvinit.cpp:ConsoleEstablishHandoff` to replicate other bits of startup, where we crack open the connect message to get the relevant bits of info.
* We pack that all into a `TERMINAL_STARTUP_INFO`, which we pass along to the registered terminal application.
* `ConptyConnection` accepts the handoff, and gathers that information out of the `TERMINAL_STARTUP_INFO`
* Some other updates to the scratch sln were made to make it build again (related, but unimportant).
* This is a precursor to:
  * #13111
  * #12154
* Closes #9458
* Tested manually
* I work here

(cherry picked from commit 7e47f6a)
Service-Card-Id: 86230565
Service-Version: 1.15
DHowett added a commit that referenced this pull request Oct 14, 2022
DHowett added a commit that referenced this pull request Oct 14, 2022
ghost pushed a commit that referenced this pull request Oct 15, 2022
DHowett added a commit that referenced this pull request Oct 17, 2022
These were wrong.

(cherry picked from commit 1f19ed0)
Service-Card-Id: 86230901
Service-Version: 1.16
@ghost
Copy link

ghost commented Oct 18, 2022

🎉Windows Terminal v1.15.2874 has been released which incorporates this pull request.:tada:

Handy links:

@DHowett DHowett moved this from Cherry Picked to Shipped in 1.15 Servicing Pipeline Dec 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-DefApp Area-Server Down in the muck of API call servicing, interprocess communication, eventing, etc. AutoMerge Marked for automatic merge by the bot when requirements are met Automerge-Not-Compatible Issue-Task It's a feature request, but it doesn't really need a major design. Needs-Second It's a PR that needs another sign-off Product-Terminal The new Windows Terminal.
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

[DefApp] Pass LNK/EXE data from OpenCon to ITerminalHandoff
3 participants