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.

Sign up for GitHub

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

Jump to bottom

Move TerminalSettings object to TermApp Project #7163

Merged
6 commits merged into from
Aug 3, 2020
Merged

Move TerminalSettings object to TermApp Project #7163

6 commits merged into from
Aug 3, 2020

Conversation

carlos-zamora
Copy link
Member

@carlos-zamora carlos-zamora commented Aug 3, 2020 •
edited by DHowett
Loading

Move TerminalSettings object from TerminalSettings project
(Microsoft.Terminal.Settings) to TerminalApp project. TerminalSettings
specifically operates as a bridge that exposes any necessary information
to a TerminalControl.

Closes #7139
Related Epic: #885
Related Spec: #6904

PR Checklist

Validation Steps Performed

Deployed Windows Terminal and opened a few new tabs.

@ghost ghost added Area-CodeHealth Issues related to code cleanliness, linting, rules, warnings, errors, static analysis, etc. Issue-Task It's a feature request, but it doesn't really need a major design. Product-Terminal The new Windows Terminal. labels Aug 3, 2020
zadjii-msft
zadjii-msft reviewed Aug 3, 2020
View reviewed changes
Copy link
Member

@zadjii-msft zadjii-msft left a comment

Choose a reason for hiding this comment

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

I don't think I have any complaints here - I'd just yank the default ctor for TermControl

src/cascadia/TerminalApp/ColorScheme.h Outdated Show resolved Hide resolved
src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj Outdated Show resolved Hide resolved
@zadjii-msft zadjii-msft added the Needs-Second It's a PR that needs another sign-off label Aug 3, 2020
@ghost ghost requested review from miniksa, DHowett and leonMSFT August 3, 2020 21:07
@carlos-zamora carlos-zamora added the AutoMerge Marked for automatic merge by the bot when requirements are met label Aug 3, 2020
@ghost
Copy link

ghost commented Aug 3, 2020

Hello @carlos-zamora!

Because this pull request has the AutoMerge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

Do note that I've been instructed to only help merge pull requests of this repository that have been opened for at least 8 hours, a condition that will be fulfilled in about 4 hours. No worries though, I will be back when the time is right! 😉

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@carlos-zamora
Copy link
Member Author

@msftbot merge this in 1 minute

@ghost
Copy link

ghost commented Aug 3, 2020

Hello @carlos-zamora!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

  • I won't merge this pull request until after the UTC date Mon, 03 Aug 2020 22:53:53 GMT, which is in 1 minute

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".

@ghost ghost merged commit eb8bb09 into master Aug 3, 2020
@ghost ghost deleted the dev/cazamor/set/term-sets-obj branch August 3, 2020 22:54
@zadjii-msft zadjii-msft mentioned this pull request Aug 11, 2020
Merged
DHowett pushed a commit that referenced this pull request Aug 11, 2020
@zadjii-msft
Enable partial rebuilds of the TerminalControl project again (#7248)
fe82e97 
This regressed around the #7163 timeframe.

We're discussing this on chat currently. It might break the intellisense
on the `#include <winrt/Microsoft.Terminal.TerminalControl.h>` line in
VS 16.7, but we're not _really_ sure? Intellisense has been notoriously
flaky for us.

I'm running 16.6.5, and it works for me. @lhecker is running 16.7 and
confirmed it worked there. If the CI build passes, then this definitely
will work for 16.7.
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DHowett DHowett DHowett approved these changes

@zadjii-msft zadjii-msft zadjii-msft approved these changes

@miniksa miniksa Awaiting requested review from miniksa

@leonMSFT leonMSFT Awaiting requested review from leonMSFT

Assignees
No one assigned
Labels
Area-CodeHealth Issues related to code cleanliness, linting, rules, warnings, errors, static analysis, etc. AutoMerge Marked for automatic merge by the bot when requirements are met 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
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Introduce/Move TerminalApp bridge
3 participants
@carlos-zamora @DHowett @zadjii-msft