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

Make sure we dont access an invalid optional on close #11857

Merged
1 commit merged into from
Dec 6, 2021
Merged

Make sure we dont access an invalid optional on close #11857

1 commit merged into from
Dec 6, 2021

Conversation

Rosefield
Copy link
Contributor

Summary of the Pull Request

Clean up an invalid access that I introduced in #11440

References

PR Checklist

  • Closes Another exception on close, maybe not a crash? #11684
  • CLA signed. If not, go over here and sign the CLA
  • Tests added/passed
  • Documentation updated. If checked, please file a pull request on our docs repo and link it here: #xxx
  • Schema updated.
  • I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

@ghost ghost added Area-Remoting Communication layer between windows. Often for windowing behavior, quake mode, etc. Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-1 A description (P1) Product-Terminal The new Windows Terminal. labels Dec 1, 2021
@Rosefield
Copy link
Contributor Author

Rosefield commented Dec 1, 2021 •
edited

NB I have not actually tested this. After pulling from main I have been unable to get the solution to compile. I installed the 10.0.22000 SDK, but am otherwise running windows 10 (20H2 19042.1348).

I get the following error when trying to compile

App.xaml: XamlCompiler error WMC0011: Unknown member 'ControlsResourcesVersion' on element 'XamlControlsResources'
TerminalPage.xaml : XamlCompiler error WMC0901: A type with a full name of 'Microsoft.UI.Xaml.Controls.TabView' already exists in an included reference.

. I have attempted to clean / rebuild the solution as well as deleting and restoring all nuget packages to no avail. Looking at git blame this particular change was added in the MUX 2.7 upgrade 2.5 months ago which I was definitely able to use at the time. I confirmed that my local install of the MUX nuget package was 2.7-prerelease.

@zadjii-msft
Copy link
Member

TerminalPage.xaml : XamlCompiler error WMC0901: A type with a full name of 'Microsoft.UI.Xaml.Controls.TabView' already exists in an included reference.

😨

I did hit that once earlier this week. Not entirely sure what caused it. The solution for me was to straight-up delete the bin\ and obj\ directories entirely. I'm thinking there is something that doesn't get marked as needing to be cleaned anymore, so VS doesn't delete it, but it definitely should be gone 🤷

If that doesn't fix it then P A N I K

@Rosefield
Copy link
Contributor Author

Ah yup, that fixed it. Also nice to clean up apparently 65GB of build artifacts that I didn't know I had.

@zadjii-msft
Copy link
Member

clean up apparently 65GB of build artifacts

Yea, the cppwinrt+xaml pch.pch's are absolutely massive, and there's unfortunately no way to share them across projects, so there's >1GB of .pch per-project, per-(project,configuration). If you're ever running low on disk space, cleaning those all out is an easy way to save a bunch, at the cost of needing to recompile them next time. That's why I stick almost exclusively in x64/Debug and never build Release

@zadjii-msft zadjii-msft added the AutoMerge Marked for automatic merge by the bot when requirements are met label Dec 6, 2021
@ghost
Copy link

ghost commented Dec 6, 2021

Hello @zadjii-msft!

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.

@ghost ghost merged commit 29e6235 into microsoft:main Dec 6, 2021
@Rosefield Rosefield deleted the bug/11684-optional-exception branch December 6, 2021 23:37
DHowett pushed a commit that referenced this pull request Dec 13, 2021
@Rosefield @DHowett
Make sure we dont access an invalid optional on close (#11857)
3a51afc 
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
Clean up an invalid access that I introduced in #11440

<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #11684
* [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA
* [ ] Tests added/passed
* [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx
* [ ] Schema updated.
* [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed

(cherry picked from commit 29e6235)
@ghost
Copy link

ghost commented Dec 14, 2021

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

Handy links:

@ghost ghost mentioned this pull request Dec 14, 2021
Closed
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
Area-Remoting Communication layer between windows. Often for windowing behavior, quake mode, etc. AutoMerge Marked for automatic merge by the bot when requirements are met Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-1 A description (P1) Product-Terminal The new Windows Terminal.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Another exception on close, maybe not a crash?
3 participants
@Rosefield @zadjii-msft @miniksa