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

Closes #2885: Allow multiple DesktopModules in a single package #2886

Closed
wants to merge 1 commit into from

Conversation

kestasjk
Copy link
Contributor

@kestasjk kestasjk commented Jul 8, 2019

Summary

A very simple change to the DesktopModule installation logic allowing multiple DesktopModules in a single Package.

@dnfclas
Copy link

dnfclas commented Jul 8, 2019

CLA assistant check
All CLA requirements met.

@kestasjk
Copy link
Contributor Author

kestasjk commented Jul 8, 2019

Note that the conflict here is trivial; this does not actually conflict with anything in the development branch.

@valadas
Copy link
Contributor

valadas commented Jul 8, 2019

@kestasjk the conflict can be resolved by merging the latest changes from the development branch, as is, this PR would undo the recent changes for supporting version numbers with 4 blocks like 01.01.01.01

@kestasjk
Copy link
Contributor Author

kestasjk commented Jul 9, 2019

Understood; I will close this and submit one with the change against the development branch.

@valadas
Copy link
Contributor

valadas commented Jul 9, 2019

That works.

Ideally for easier patching of PRs if you get requested some minor change:

  1. In your local clone, switch to the target branch
git checkout development
  1. If not done already, setup the upstream repository
git remote add upstream https://github.com/dnnsoftware/Dnn.Platform
  1. Ensure your target branch is up to date
git fetch upstream
git pull upstream development
  1. Create a branch specific to the subject you are working on
git checkout -b issue-2886
  1. Do your thing as usual, commit, push submit PR, etc.

Then if changes are needed you can just return to that subject specific branch and add more commits and push, that will update the PR in place without any other steps.

bdukes pushed a commit to bdukes/Dnn.Platform that referenced this pull request Sep 3, 2021
By allowing a DesktopModule to have an explicit FriendlyName and
Description set by the install manifest, instead of using the Package
FriendlyName and Description, allows multiple DesktopModules per Package

Fixes dnnsoftware#2887
Reimplementation of dnnsoftware#2887 and dnnsoftware#2886
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants