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

Obstruct the user when they try to run WT under WOW #1648

Merged
5 commits merged into from
Jul 11, 2019
Merged

Obstruct the user when they try to run WT under WOW #1648

5 commits merged into from
Jul 11, 2019

Conversation

DHowett-MSFT
Copy link
Contributor

Summary of the Pull Request

This should give us an anchor for when users complain.

image

Validation Steps Performed

Manual testing.

@oising
Copy link
Collaborator

oising commented Jun 26, 2019

"AMD? I'm pretty sure I'm running Intel!"

@DHowett-MSFT
Copy link
Contributor Author

Well technically! 😉

@miniksa
Copy link
Member

miniksa commented Jun 26, 2019

"AMD? I'm pretty sure I'm running Intel!"

If this were the internal previews, then @DHowett-MSFT would have said "Reporting this will get you banned from the selfhost program." :P

miniksa
miniksa requested changes Jun 26, 2019
View reviewed changes
Copy link
Member

@miniksa miniksa left a comment

Choose a reason for hiding this comment

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

Please don't hate me for asking for a .res file.

@ghost ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Jun 26, 2019
zadjii-msft
zadjii-msft approved these changes Jul 2, 2019
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.

This is a fine addition that certainly helps, with or without the res file. I think I'm okay with this not having a res file for now, because it'll be goodness, though if we do, we should file a v0.3 issue to add the res file.

src/cascadia/WindowsTerminal/main.cpp Show resolved Hide resolved
@zadjii-msft zadjii-msft added this to the Terminal v0.3 - Preview 2 milestone Jul 2, 2019
@ghost
Copy link

ghost commented Jul 9, 2019

This pull request has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for 7 days. It will be closed if no further activity occurs within 7 days of this comment.

@ghost ghost added the No-Recent-Activity This issue/PR is going stale and may be auto-closed without further activity. label Jul 9, 2019
@miniksa
Copy link
Member

miniksa commented Jul 10, 2019

OK we're not stale anymore. I'm going to finish this up for Dustin and push it in.

@ghost ghost removed the No-Recent-Activity This issue/PR is going stale and may be auto-closed without further activity. label Jul 10, 2019
@miniksa miniksa added AutoMerge Marked for automatic merge by the bot when requirements are met and removed Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something labels Jul 11, 2019
@ghost
Copy link

ghost commented Jul 11, 2019

Hello @miniksa!

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.

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.

DHowett-MSFT
DHowett-MSFT commented Jul 11, 2019
View reviewed changes
src/cascadia/WindowsTerminal/WindowsTerminal.rc
IDS_ERROR_ARCHITECTURE_FORMAT
"Windows Terminal is designed to run on your system's native architecture (%s).\nYou are currently using the %s version.\n\nPlease use the version of Windows Terminal that matches your system's native architecture."
IDS_X86_ARCHITECTURE "i386"
END
Copy link
Contributor Author

Choose a reason for hiding this comment

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

qq: why two tables?

@ghost ghost merged commit 60a444c into master Jul 11, 2019
@ghost ghost deleted the dev/duhowett/obstruct branch July 11, 2019 17:23
mcpiroman pushed a commit to mcpiroman/terminal that referenced this pull request Jul 23, 2019
@DHowett @mcpiroman
Obstruct the user when they try to run WT under WOW (microsoft#1648)
e72a424 
* Obstruct the user when they try to run under WOW

* Move strings to resource file, add comments to methods, remove extraneous wil include.

* remove excess newline

* output of formatter.
@miniksa miniksa mentioned this pull request Jul 31, 2019
Closed
@ghost
Copy link

ghost commented Aug 3, 2019

🎉Windows Terminal Preview v0.3.2142.0 has been released which incorporates this pull request.:tada:

Handy links:

@miniksa miniksa mentioned this pull request Oct 3, 2019
Merged
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miniksa miniksa miniksa approved these changes

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

Assignees
No one assigned
Labels
AutoMerge Marked for automatic merge by the bot when requirements are met
Projects
None yet
Milestone
Terminal v0.3
Development

Successfully merging this pull request may close these issues.
5 participants
@DHowett-MSFT @oising @miniksa @zadjii-msft @DHowett