Skip to content

Issue #73: proposal for AssemblyInformationalVersioningScheme #658

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

Closed
wants to merge 2 commits into from

Conversation

MarkZuber
Copy link
Contributor

Similar to the AssemblyVersioningScheme setting, this adds the ability to configure an AssemblyInformationalVersioningScheme in the yml file. The default remains "full informational" as it is today.

The new option is for NugetVersion which will put the same tag into the AssemblyInformationalVersion attribute that it would for the NuGet package version.

This should allow IncludeReferencedProjects to work according to the Nuget docs:

From nuget docs (https://docs.nuget.org/create/versioning)

If building a package from a project (.csproj or .vbproj), use the AssemblyInformationalVersionAttribute to specify the version.

[assembly: AssemblyInformationalVersion("1.0.1-alpha")]

NuGet will pick up this value instead of the one specified in the AssemblyVersion attribute (this attribute does not support SemVer which is why a different attribute was needed).

@JakeGinnivan
Copy link
Contributor

Ditto, a few things which will make your life easier:

  1. Work on feature branches
  2. Have two remotes configured, origin pointing at your fork, upstream pointing at the main repo
  3. rebase your feature branch on upstream/master
  4. Never commit to master, just update it with new stuff from upstream.

To get yourself in this state you want to:

git checkout -b feature/assemblyInfoUpdates
git fetch upstream
git rebase upstream/master    # if you hit conflicts, you resolve just like a merge. Make sure you git rebase --continue after though, not commit
git checkout master
git reset --hard upstream/master   # this will fix your master so it doesn't have any merge commits or commits on it and can be updated with a fast forward merge
git checkout feature/assemblyInfoUpdates
git push origin feature/assemblyInfoUpdates

Then you can create a new pull request from your feature branch. Let me know if you need more info Mark, git has a bit of a learning curve :)

@MarkZuber
Copy link
Contributor Author

Hey Jake,

Thanks. That was super helpful. I appreciate your patience :D

Updated pull request from my feature branch has been submitted:
#660

I've verified locally with my exe that it solves the issue. And I've run
all unit tests (including new ones) and verified that they've passed.

thanks!
mark

On Thu, Oct 1, 2015 at 11:34 PM, Jake Ginnivan [email protected]
wrote:

Ditto, a few things which will make your life easier:

  1. Work on feature branches
  2. Have two remotes configured, origin pointing at your fork, upstream
    pointing at the main repo
  3. rebase your feature branch on upstream/master
  4. Never commit to master, just update it with new stuff from upstream.

To get yourself in this state you want to:

git checkout -b feature/assemblyInfoUpdates
git fetch upstream
git rebase upstream/master # if you hit conflicts, you resolve just like a merge. Make sure you git rebase --continue after though, not commit
git checkout master
git reset --hard upstream/master # this will fix your master so it doesn't have any merge commits or commits on it and can be updated with a fast forward merge
git checkout feature/assemblyInfoUpdates
git push origin feature/assemblyInfoUpdates

Then you can create a new pull request from your feature branch. Let me
know if you need more info Mark, git has a bit of a learning curve :)


Reply to this email directly or view it on GitHub
#658 (comment).

@JakeGinnivan
Copy link
Contributor

Superseded by #660

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.

3 participants