Skip to content

Conversation

eriove
Copy link
Contributor

@eriove eriove commented Feb 1, 2016

I added the [assembly: CLSCompliant(true)], since the assembly is CLS compliant this make sense.

@angularsen
Copy link
Owner

Please rebase this PR onto the latest upstream/master instead of a merge commit. A PR should only contain commits that contribute something so it's clear what it changes.

Also strip out the bump of version in AssemblyVersion("3.25.0")]. In latest master this has been set back to 1.0.0 as it should only be bumped as part of building and publishing nugets.

@eriove
Copy link
Contributor Author

eriove commented Feb 1, 2016

I've tried rebase-ing (git rebase upstream/master). It's the first time I've done a rebase so I might have done something wrong but the end result made no changes to the code (which was expected since the merge essentially did the same thing in terms of code changes). When I merged I changed the version number to 1.0.0 so the actual code changes should be correct in this pull request.

Will rebase instead of merging the next time.

@angularsen
Copy link
Owner

Alright, you should do an interactive rebase so you can remove the merge commit from the rebased commits (only rebasing the CLSCompliant commit on top of master). No worries though.

angularsen added a commit that referenced this pull request Feb 1, 2016
@angularsen angularsen merged commit 9a77f2a into angularsen:master Feb 1, 2016
@eriove
Copy link
Contributor Author

eriove commented Feb 1, 2016

Thanks!

@eriove eriove deleted the feature/CLSCompliant branch February 28, 2016 08:25
@eriove eriove mentioned this pull request Jul 27, 2017
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.

2 participants