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

(#857) Load Chocolatey executable assembly #858

Merged
merged 1 commit into from
Jun 3, 2021

Conversation

AdmiringWorm
Copy link
Member

This pull request updates the Chocolatey GUI and Chocolatey GUI CLI Assembly Loader to load the main Chocolatey executable as an assembly, instead of loading the included Chocolatey DLL file.
With the changes made here, the DLL file will no longer be included in the installation.

fixes #857

@AdmiringWorm AdmiringWorm requested a review from gep13 June 1, 2021 13:46
@gep13
Copy link
Member

gep13 commented Jun 1, 2021

@AdmiringWorm this change will go out as a hotfix release, rather than as part of the next release from develop branch. Can you create a new hotfix/0.18.2 branch, and re-target this PR there?

Copy link
Member

@gep13 gep13 left a comment

Choose a reason for hiding this comment

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

This looks really good to me, just a couple of minor tweaks and suggestions. Can you update the commit message with information about why we need this change? i.e. to protect ourselves from incompatibilities when the version of Chocolatey installed globally is newer than what is shipped with Chocolatey GUI.

Source/ChocolateyGui/App.xaml.cs Outdated Show resolved Hide resolved
Source/ChocolateyGui/App.xaml.cs Outdated Show resolved Hide resolved
Source/ChocolateyGui.Common/Startup/AssemblyResolver.cs Outdated Show resolved Hide resolved
Source/ChocolateyGuiCli/Runner.cs Outdated Show resolved Hide resolved
@gep13
Copy link
Member

gep13 commented Jun 1, 2021

@AdmiringWorm am I right in saying that the changes that are included here result in the chocolatey.dll being omitted from the generated MSI, or is there additional work needed here?

@AdmiringWorm
Copy link
Member Author

@AdmiringWorm am I right in saying that the changes that are included here result in the chocolatey.dll being omitted from the generated MSI, or is there additional work needed here?

There is no additional work needed, due to all of the projects setting chocolatey.dll to not copy itself it won't end up in the MSI either.

Requested changes have been made.

@AdmiringWorm

This comment has been minimized.

This commit makes changes to the assembly loader to
load the installed Chocolatey executable as an
assembly instead of the statically referenced
DLL file

These changes are necessary to ensure that there will
be minimal incompatibilities between running Chocolatey CLI
and Chocolatey GUI for both FOSS and Licensed users.
@AdmiringWorm AdmiringWorm changed the base branch from develop to hotfix/0.18.2 June 2, 2021 08:06
@AdmiringWorm AdmiringWorm requested a review from gep13 June 2, 2021 08:10
Copy link
Member

@gep13 gep13 left a comment

Choose a reason for hiding this comment

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

LGTM!

@gep13 gep13 merged commit f0587b1 into chocolatey:hotfix/0.18.2 Jun 3, 2021
@gep13
Copy link
Member

gep13 commented Jun 3, 2021

@AdmiringWorm thank you very much for working through this!

@AdmiringWorm AdmiringWorm deleted the use-choco-exec branch June 3, 2021 07:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants