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

Conditional ms build tasks #676

Closed
wants to merge 12 commits into from
Closed

Conditional ms build tasks #676

wants to merge 12 commits into from

Conversation

pi3k14
Copy link
Contributor

@pi3k14 pi3k14 commented Oct 8, 2015

Added a possibility to conditionaly omit/avoid Targets in the GitVersionTask.targets file. As default all task are enabled (no change in default behavior).
If user eg. set property UpdateAssemblyInfo to false, this task won't be executed.

@gep13
Copy link
Member

gep13 commented Oct 8, 2015

@SimonCropp does this look ok to you? Thanks!

@JakeGinnivan
Copy link
Contributor

@pi3k14 Can you add these additional properties to the docs?

@SimonCropp
Copy link
Contributor

@gep13 looks ok to me

@JakeGinnivan
Copy link
Contributor

Just checking on the status of this. @pi3k14 are you able to update the docs in this PR then I can merge it in?

@pi3k14
Copy link
Contributor Author

pi3k14 commented Oct 12, 2015

Hm, I got some merge problem when trying to update the documentation, and some more strange results when trying to sync my repo with GitVersion repo. Did someone remove the docs/usage.md?

Everything seems OK now (from my perspective :)

@JakeGinnivan
Copy link
Contributor

Someone did move usage actually. it got split up into usage for the different ways. If you have time you can rebase and apply the changes to the correct file. Otherwise I will do it myself when I have a chance

@pascalberger
Copy link
Member

@pi3k14
Copy link
Contributor Author

pi3k14 commented Oct 12, 2015

Ah, OK - will take a stab at it.

@pi3k14
Copy link
Contributor Author

pi3k14 commented Oct 12, 2015

Argh, git is not my tool.
The files are OK, but the commit history is terrible.

@pascalberger
Copy link
Member

You can squash todays commits together to make the commit history look nicer

@gep13
Copy link
Member

gep13 commented Oct 12, 2015

@pi3k14 if you are not familiar with how to do this, here are a couple articles that might help you:

http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History

Feel free to ask if you run into any problems. Rewriting commit history can be daunting to start with, but after you have done it a couple times, it becomes very easy 😸

@pi3k14
Copy link
Contributor Author

pi3k14 commented Oct 12, 2015

Thanks for the information, I read that squash/rebase has to be done before push'ing to another repo?

Have I misunderstood something?

@pascalberger
Copy link
Member

Squashing and rebasing rewrites history, which is a bad thing if you have pushed the branch and someone else has cloned the repo and checked out your branch. But in the case of this PR I think it won't be a problem to rewrite history, since you can assume that no one else has cloned from your repo.

@gep13
Copy link
Member

gep13 commented Oct 12, 2015

Exactly what @pascalberger said 👍 Also, it is why we recommend that all work be done in a branch off of master, so that we have the opportunity to allow squashing and rewriting. It is something that should be used with caution, but it is also something that is incredibly powerful once you are comfortable using it.

@pi3k14
Copy link
Contributor Author

pi3k14 commented Oct 12, 2015

Nah, throwing in the towel (my local repo is a complete mess, and files in PR is wrong).
Closing the PR and creating a new one

@pi3k14 pi3k14 closed this Oct 12, 2015
@pi3k14 pi3k14 deleted the ConditionalMsBuildTasks branch October 12, 2015 16:32
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.

5 participants