Skip to content

[WIP]Fix nightly upload nuget package order #439

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

Conversation

MarcoRossignoli
Copy link
Collaborator

@MarcoRossignoli MarcoRossignoli commented May 27, 2019

Fix nightly upload nuget package order

Now we've order i.e. coverlet.msbuild.2.6.1-preview-0011-gfbf1f3beb8.nupkg

cc: @tonerdo

AArnott and others added 5 commits May 26, 2019 19:07
All the redundancy between the .nuspec file and the .csproj file (both express and implied) is now removed. With it, I fix a few bugs:

1. The generated nuspec file includes the developmentDependency tag that was in the project file but not the checked in file.
1. The package now applies to *all* projects regardless of their target framework (well, so long as they're .netstandard1.0 compatible) instead of all projects rejecting this package unless they targeted .NET Core 2.0 or higher.

I also moved the .targets file into a folder structure within the project that resembles where it will appear in the package. This makes it more obvious that it belongs to the package when looking at the source code, and makes it easier to maintain the build/ folder in the package going forward because all files in it are included.

Fixes coverlet-coverage#431
For a perfectly clean repo (git clean -fdx), `dotnet build` fails because some tests require that other projects have been built using build.proj first.

This change adds the necessary build ordering instructions so that the build tasks are always built before the tests that need them, and the tests are always run against the *latest* source code being tested rather than the last version that happened to be built with build.proj.
@MarcoRossignoli MarcoRossignoli changed the title Temporary fix master nuget package Temporary fix nightly upload nuget package May 27, 2019
@MarcoRossignoli MarcoRossignoli changed the title Temporary fix nightly upload nuget package Fix nightly upload nuget package order May 27, 2019
@MarcoRossignoli
Copy link
Collaborator Author

MarcoRossignoli commented May 28, 2019

@AArnott here #403 (comment) you said "moving your versioning to a major.minor.height pattern?" but I cannot have this behaviour, in this PR I fixed order issue and I like it we release 3 package with hash and height and after some usage tests I found ok the user experience, clear the order(last master first in vs dropdown) and simple way to link with master commit with hash.
Could be also better if we generate something like coverlet.msbuild.2.6.11-preview-gfbf1f3beb8.nupkg instead of coverlet.msbuild.2.6.1-preview-0011-gfbf1f3beb8.nupkg but 1.0.{height}-preview schema is not supported, what I'm missing?

EDIT:
I did other checks but seem that it doesn't work as I expect.
If I pass /p:PublicRelease=true to build I get removed only hash git but not preview and height.
What I would(if possible) is:

/p:PublicRelease=false generate coverlet.msbuild.2.6.11-preview-gfbf1f3beb8.nupkg
/p:PublicRelease=truegenerate coverlet.msbuild.2.6.11.nupkg

11 is the height

@AArnott is this possible?

@MarcoRossignoli MarcoRossignoli changed the title Fix nightly upload nuget package order [WIP]Fix nightly upload nuget package order May 28, 2019
tonerdo added 3 commits May 28, 2019 15:59
Replace checked in .nuspec file with generated one
…celinkbug

[Bug fix]Fix "/p:UseSourceLink=true" bug
@MarcoRossignoli
Copy link
Collaborator Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@AArnott
Copy link
Contributor

AArnott commented May 28, 2019

here #403 (comment) you said "moving your versioning to a major.minor.height pattern?" but I cannot have this behaviour,

It's up to you. But I'm a bit confused because later in your above comment it sounds like you're asking for exactly what I had prescribed:

Could be also better if we generate something like coverlet.msbuild.2.6.11-preview-gfbf1f3beb8.nupkg instead of coverlet.msbuild.2.6.1-preview-0011-gfbf1f3beb8.nupkg

Yes. I'm happy to help you do that.

but 1.0.{height}-preview schema is not supported, what I'm missing?

That's not the right syntax. Instead, use 1.0-preview. The {height} macro is only used when inside a prerelease tag. Otherwise, the height is implied as the next integer in the version that you haven't specified. So if you specify major.minor, then height goes into PATCH, and if you specify major.minor.patch then height goes into REVISION (4th integer).

@MarcoRossignoli
Copy link
Collaborator Author

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@AArnott
Copy link
Contributor

AArnott commented May 28, 2019

Now regarding the -preview tag and the hash that you're struggling with... I'm writing up a doc to explain it. I've had to explain it a few times so I figured a doc would save me time down the road.

@MarcoRossignoli
Copy link
Collaborator Author

Close and reopen I did a mess with rebase 😞

@MarcoRossignoli MarcoRossignoli deleted the fixnightly branch May 28, 2019 18:34
@MarcoRossignoli
Copy link
Collaborator Author

BTW @AArnott seem that works as expected now
image

I'll open a new PR with where I'll publish directly with CI, we'll go on on that thread!

@MarcoRossignoli
Copy link
Collaborator Author

MarcoRossignoli commented May 28, 2019

Now regarding the -preview tag and the hash that you're struggling with... I'm writing up a doc to explain it. I've had to explain it a few times so I figured a doc would save me time down the road.

@AArnott point me your doc when done!

@AArnott
Copy link
Contributor

AArnott commented May 28, 2019

Will do. I hope to have it done by EOD.

@MarcoRossignoli
Copy link
Collaborator Author

Oh ready for my breakfast 😄

@AArnott
Copy link
Contributor

AArnott commented May 29, 2019

OK, here is the first draft. I'd be interested in your feedback and questions before I merge this into master.

@MarcoRossignoli
Copy link
Collaborator Author

Doc are very clear...open a draft if you want and I'll review also with some simple advice like newlines

@AArnott
Copy link
Contributor

AArnott commented May 29, 2019

Done: dotnet/Nerdbank.GitVersioning#345

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