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

Fix PGO by "installing" a newer version of VCLibs to our app folder #13502

Merged
1 commit merged into from
Jul 14, 2022

Conversation

DHowett
Copy link
Member

@DHowett DHowett commented Jul 14, 2022

Moving to VS 2022 and C++20 in #13368 introduced a new dependency on an
as-yet-nonexistent VC Runtime library: msvcp140_atomic_wait.dll. That
library is not installed on the 21H1 machines that run our PGO tests.

Fortunately, the app platform will--largely--handle this dependency for
us on machines in the wild.

Fixes #13500

@DHowett
Copy link
Member Author

DHowett commented Jul 14, 2022

My one commit asks the question, "Does this fix PGO?"
The build results show that it does.

Copy-Item "$repoDirectory\Artifacts\$ArtifactName\appx\CascadiaPackage_0.0.1.0_$Platform.msix" $payloadDir\CascadiaPackage.zip
Copy-Item "C:\program files (x86)\Microsoft SDKs\Windows Kits\10\ExtensionSDKs\Microsoft.VCLibs.Desktop\14.0\Appx\Retail\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" $payloadDir\VCLibs.zip
Copy link
Member Author

Choose a reason for hiding this comment

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

This assumes that the staging machine that prepares Helix has the same build tool configuration as the one that built terminal. That's a fair assumption.

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.

Fortunately, the app platform will--largely--handle this dependency for
us on machines in the wild

super looking forward to the bugs when this small-ly doesn't

Copy link
Member

@lhecker lhecker left a comment

Choose a reason for hiding this comment

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

woops

@DHowett
Copy link
Member Author

DHowett commented Jul 14, 2022

@msftbot merge this in 1 minute

@ghost ghost added the AutoMerge Marked for automatic merge by the bot when requirements are met label Jul 14, 2022
@ghost
Copy link

ghost commented Jul 14, 2022

Hello @DHowett!

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 Thu, 14 Jul 2022 03:27:20 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".

@DHowett
Copy link
Member Author

DHowett commented Jul 14, 2022

super looking forward to the bugs when this small-ly doesn't

Ugh, amen to that

@ghost ghost merged commit ae9532f into main Jul 14, 2022
@ghost ghost deleted the dev/duhowett/pgo_maybe branch July 14, 2022 03:28
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
AutoMerge Marked for automatic merge by the bot when requirements are met
Projects
None yet
Development

Successfully merging this pull request may close these issues.

PGO has been "at a farm upstate" since VS 2022
3 participants