8000 Add Missing Assemblies to TPA List for Pwrshplugin.dll by mirichmo · Pull Request #4502 · PowerShell/PowerShell · GitHub
[go: up one dir, main page]

Skip to content

Add Missing Assemblies to TPA List for Pwrshplugin.dll #4502

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

Merged

Conversation

mirichmo
Copy link
Member
@mirichmo mirichmo commented Aug 4, 2017

This PR updates the TPA list for pwrshplugin.dll to reflect the recent additions to the DLL. It also adds support for VS 2017 compilation by adding a work-around for and include path that gets corrupted by VS 2017.

@mirichmo mirichmo added Area-Maintainers-Build specific to affecting the build WG-Remoting PSRP issues with any transport layer labels Aug 4, 2017
@mirichmo mirichmo requested a review from daxian-dbw August 4, 2017 19:34
# during compilation. We work around the problem by force-including the
# contents of the environment variable before it gets corrupted.
#
target_include_directories(pwrshcommon PUBLIC $ENV{INCLUDE})
Copy link
Member

Choose a reason for hiding this comment

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

I assume adding this would still work on a machine with VS15 installed only, right?

Copy link
Member Author
@mirichmo mirichmo Aug 4, 2017

Choose a reason for hiding this comment

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

That is the scenario where I ran it. My system has VS 2015 and VS 2017 installed side-by-side. I have not verified it on a system that only has VS 2017. As long as vcvarsall.bat generates the correct INCLUDE environment variable, it should work though.

Additional search paths will not cause a working instance to fail, so it is a lower risk change.

Copy link
Member

Choose a reason for hiding this comment

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

I have not verified it on a system that only has VS 2017.

I'm not worried about a system that only has VS 2017, but a system that only has VS 2015. Our current release build pipeline in VSTS only installs VS 2015. I want to make sure we don't break there.

Copy link
Member

Choose a reason for hiding this comment

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

OK. I checked out this PR and verified that it builds fine with VS 2015 installed only and the generated plugin binary works.

@daxian-dbw daxian-dbw merged commit 24cf216 into PowerShell:master Aug 7, 2017
@mirichmo mirichmo deleted the mirichmo-add-missing-assemblies-to-tpa branch August 7, 2017 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Maintainers-Build specific to affecting the build WG-Remoting PSRP issues with any transport layer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
0