Add support for overriding repository url, version and uploading multiple packages simultaneously using a glob pattern (wildcards) #53

peters · 2020-06-12T16:45:17Z

Uploading a single .nupkg file
gpr push your.nupkg -r ${{ github.repository }} -k ${{ secrets.GITHUB_TOKEN }}
gpr push your.nupkg your.snupkg -r ${{ github.repository }} -k ${{ secrets.GITHUB_TOKEN }}
Upload all .nupkg files in current working directory
gpr push *.nupkg -r ${{ github.repository }} -k ${{ secrets.GITHUB_TOKEN }}
Upload all .nupkg files in current working directory
gpr push *.nupkg -r ${{ github.repository }} -k ${{ secrets.GITHUB_TOKEN }}
Upload all .nupkg, .snupkg files in current working directory
gpr push . -r ${{ github.repository }} -k ${{ secrets.GITHUB_TOKEN }}
Upload recursively all .nupkg files found in current working directory
gpr push **\**.nupkg -r ${{ github.repository }} -k ${{ secrets.GITHUB_TOKEN }}
Upload recursively all .nupkg, .snupkg (symbol packages) files found in current working directory
gpr push **\** -r ${{ github.repository }} -k ${{ secrets.GITHUB_TOKEN }}

Fixes #30
Fixes #47
Fixes #48
Fixes #50

jcansdale

This PR is very much appreciated, thank you! 🙏

I'm wondering if it would make sense to simplify this to take a repository ( e.g. OWNER/REPOSITORY) rather than a repository URL? That would make it easy to use ${{ github.repository }} in a publish workflow, which will probably be the most common configuration.

src/GprTool/NugetExtensions.cs

src/GprTool/Program.cs

@jcansdale

…ushing nupkg to GPR. Fixes jcansdale#48 Update error message. Remove dead code because there are no "xmlns" attributes to remove when instantiating a new XElement. Rename file. Refactor: Owner property is no longer required. Address feedback regarding --repository option that should be in the following format: owner/repository. This makes it trivial to change repository url in a github actions scenario: gpr push your.nupkg --repository ${{ github.repository }} -k ${{ secrets.GITHUB_TOKEN }}. I have added additional test cases that verifies that we only rewrite nuspec if repository url, repository type or version has been changed. /cc @jcansdale Bugfix: Dispose nuspec context property. Only attempt to parse version if repository option has been set. Bugfix: Remove "_gpr.nupkg" prefix if nupkg is rewritten before uploading nupkg to GPR. Rename class to XElementExtensions.

jcansdale

I like the way this is shaping out! If we could just check that either the .nupkg contains a repository element or the --repository option is defined. That would catch a load of user error and make the --repository option more discoverable. 😄

src/GprTool/NuGetUtilities.cs

src/GprTool/Program.cs

…ng the user to upload multiple packages simultaneously. Concurrency may be controlled via the optional "--concurrency" command.

… it's determined to be irrelevant (has no effect in the package upload process).

…om nupkg metadata. If value is invalid then inform user that they may override repository url using the --repository option.

peters · 2020-06-15T09:10:14Z

@jcansdale I've adressed your feedback :)

jcansdale

Just a couple of nits/suggested changes. 👍

src/GprTool/NuGetUtilities.cs

src/GprTool/Program.cs

test/GprTool.Tests/StringExtensions.cs

…and uploading multiple packages in parallel. Concurrency can be controlled by the "--concurrency" option. Fixes jcansdale#30

peters · 2020-06-15T13:02:01Z

@jcansdale I merged #30 into this PR. I've also addressed your feedback. Much appreciated :)

src/GprTool/Program.cs

jcansdale · 2020-06-15T15:51:06Z

@peters it looks like we have a merge conflict. Can I leave that to you because I'll probably mess it up. 😉

# Conflicts: # src/GprTool/Program.cs

peters · 2020-06-15T15:52:47Z

@peters it looks like we have a merge conflict. Can I leave that to you because I'll probably mess it up. 😉

Hehe! 👯 Fixed in 1f417fd.

…l .nupkg, .snupkg files found in current working directory.

jcansdale · 2020-06-16T19:33:11Z

@peters I'm afraid I'm still seeing this:

$ dotnet run --project src/GprTool/GprTool.csproj push 'publish/**/*.nupkg' -k xxxxxx --repository jcansdale/packages
Unable to find any packages in directory /Users/jcansdale/git/github.com/jcansdale/gpr matching glob pattern: publish/**/*.nupkg. Valid filename extensions are .nupkg, .snupkg.

I'm guessing you're using Windows. Is it doing this on that?

jcansdale · 2020-06-16T19:48:09Z

I've fixed the, "Unable to find any packages in directory" error in 623bfce. It looks like we needed to use the a full path in the glob.

…or expanding both relative and absolute glob patterns.

peters · 2020-06-16T21:48:51Z

I've fixed the, "Unable to find any packages in directory" error in 623bfce. It looks like we needed to use the a full path in the glob.

You are correct. I did some refactoring in order to handle both relative and absolute glob patterns in commit 04fd2b4

I've tested the following patterns on Windows. In the examples below, working directory is c:\github\gpr

gpr push . -r peters/gpr -k token -> c:\github\gpr\*.*
gpr push nupkg -r peters/gpr -k token -> c:\github\gpr\nupkg\*.*
gpr push ./nupkg -r peters/gpr -k token -> c:\github\gpr\nupkg\*.*
gpr push .\nupkg -r peters/gpr -k token -> c:\github\gpr\nupkg\*.*
gpr push nupkg/*.*-r peters/gpr -k token -> c:\github\gpr\nupkg\*.*
gpr push nupkg/**/*.nupkg -r peters/gpr -k token -> c:\github\gpr\nupkg\**\*.nupkg
gpr push nupkg/**/** -r peters/gpr -k token -> c:\github\gpr\nupkg\**\**
gpr push c:\github\gipr\nupkg/**/** -r peters/gpr -k token -> c:\github\gpr\nupkg\**\**

Test cases are available here: https://github.com/jcansdale/gpr/blob/8fd11e62f311d385efe71715ece8bef8056f7520/test/GprTool.Tests/IoExtensionsTests.cs

…dale

…dale

…:IsRunningTests=True

jcansdale

This is looking great!

My last suggestion is to make the re-written package's extension .zip. This would be a simple way to prevent re-written packages being picked up by subsequent publishes.

For example, this happened in one of my tests:

$ dotnet run --project src/GprTool/GprTool.csproj push publish/system.threading.threadpool/4.0.10 --repository jcansdale/packages
Found 4 packages.
[System.Threading.ThreadPool.4.0.10_79a787939afb425bad2ec43d523b7a35_gpr.nupkg]: Repository url: https://github.com/jcansdale/packages. Version: 4.0.10. Size: 87957 bytes. 
[System.Threading.ThreadPool.4.0.10_8593de2577f6432e8ce0f86978d9fd21_gpr.nupkg]: Repository url: https://github.com/jcansdale/packages. Version: 4.0.10. Size: 87955 bytes. 
[System.Threading.ThreadPool.4.0.10_b40597b284c04a70b02ed302b5381d4d_gpr.nupkg]: Repository url: https://github.com/jcansdale/packages. Version: 4.0.10. Size: 87955 bytes. 
[System.Threading.ThreadPool.4.0.10_b40597b284c04a70b02ed302b5381d4d_gpr.nupkg]: Uploading package.
[System.Threading.ThreadPool.4.0.10_8593de2577f6432e8ce0f86978d9fd21_gpr.nupkg]: Uploading package.
[System.Threading.ThreadPool.4.0.10_79a787939afb425bad2ec43d523b7a35_gpr.nupkg]: Uploading package.
[System.Threading.ThreadPool.4.0.10.nupkg]: Repository url: https://github.com/jcansdale/packages. Version: 4.0.10. Size: 87958 bytes. 
[System.Threading.ThreadPool.4.0.10.nupkg]: Uploading package.
[System.Threading.ThreadPool.4.0.10_79a787939afb425bad2ec43d523b7a35_gpr.nupkg]: Error: Version System.Threading.ThreadPool of "4.0.10" has already been pushed.
[System.Threading.ThreadPool.4.0.10_8593de2577f6432e8ce0f86978d9fd21_gpr.nupkg]: Error: Version System.Threading.ThreadPool of "4.0.10" has already been pushed.
[System.Threading.ThreadPool.4.0.10.nupkg]: Error: Version System.Threading.ThreadPool of "4.0.10" has already been pushed.
[System.Threading.ThreadPool.4.0.10_b40597b284c04a70b02ed302b5381d4d_gpr.nupkg]: Error: Version System.Threading.ThreadPool of "4.0.10" has already been pushed.

I've marked this PR as ✅ , so merge at will. Thanks for this excellent contribution! 😄

src/GprTool/NuGetUtilities.cs

peters · 2020-06-17T00:26:50Z

@jcansdale Build is green on Windows/Linux: https://github.com/peters/gpr/runs/778631740?check_suite_focus=true
You can go ahead and copy the workflow file if you want: https://github.com/peters/gpr/blob/master/.github/workflows/dotnetcore.yml

It would be useful if you could also add build badges: https://github.com/peters/gpr#gpr

One final request would be to enable dependabot so that nuget dependencies are updated (PR) automatically on a daily schedule.

Bonus: If you could enable prerelease versioning on PRs that would be awesome and it would be really easy to test new changes :)

Co-authored-by: Jamie Cansdale <[email protected]>

…ng nupkg in order to avoid uploading previously written packages.

…s a glob pattern. Maybe also fixes jcansdale#57 ?

…sed on the underlying OS.

peters · 2020-06-17T01:37:48Z

@jcansdale I updated the workflow file with OSX support. It should be as simple as copy-pasting the workflow file into this repository and we are good to go :)

Test are green on Windows, OSX and Linux: https://github.com/peters/gpr/runs/778786424?check_suite_focus=true

peters · 2020-06-17T01:44:13Z

LGTM 👍

jcansdale · 2020-06-17T13:50:17Z

@peters It feels good to merge this PR! 🙏 🎈 👍

peters · 2020-06-17T14:14:47Z

@jcansdale Awesome! Thanks for excellent feedback reviews :)

jcansdale · 2020-06-17T15:50:50Z

@jcansdale I updated the workflow file with OSX support. It should be as simple as copy-pasting the workflow file into this repository and we are good to go :)

Thanks, I merged it in #58

Swoorup · 2020-11-22T10:22:00Z

Just tried it out bulk uploading packages. This is pretty great and easy to use @peters

peters force-pushed the issue-48 branch 2 times, most recently from 391667c to cd37290 Compare June 12, 2020 16:53

peters mentioned this pull request Jun 12, 2020

Feature: Set default repository and automatically add repository url and type on push #48

Closed

jcansdale requested changes Jun 13, 2020

View reviewed changes

src/GprTool/NugetExtensions.cs Outdated Show resolved Hide resolved

src/GprTool/Program.cs Outdated Show resolved Hide resolved

src/GprTool/Program.cs Outdated Show resolved Hide resolved

src/GprTool/Program.cs Outdated Show resolved Hide resolved

peters force-pushed the issue-48 branch from d2a0003 to 84e711d Compare June 13, 2020 10:18

peters force-pushed the issue-48 branch from 84e711d to f30e12d Compare June 13, 2020 10:24

Add support for wildcards when pushing. Fixes jcansdale#30

3d5de9a

jcansdale requested changes Jun 13, 2020

View reviewed changes

src/GprTool/NuGetUtilities.cs Outdated Show resolved Hide resolved

src/GprTool/Program.cs Outdated Show resolved Hide resolved

peters added 5 commits June 15, 2020 09:56

Add additional test cases. Ref. jcansdale#55 (comment)

1f7699f

Add support for *.snupkg (symbol packages) and parallelization allowi…

78258d6

…ng the user to upload multiple packages simultaneously. Concurrency may be controlled via the optional "--concurrency" command.

Add additional test cases.

5874ae5

Ignore repository type when determining if we should rewrite nupkg as…

8810332

… it's determined to be irrelevant (has no effect in the package upload process).

If --repository option is not supplied then read <RepositoryUrl /> fr…

30e1dd8

…om nupkg metadata. If value is invalid then inform user that they may override repository url using the --repository option.

jcansdale reviewed Jun 15, 2020

View reviewed changes

src/GprTool/NuGetUtilities.cs Outdated Show resolved Hide resolved

src/GprTool/Program.cs Outdated Show resolved Hide resolved

test/GprTool.Tests/StringExtensions.cs Outdated Show resolved Hide resolved

Add support for wildcards (glob patterns), symbol packages (.snupkg) …

dfa4ec4

…and uploading multiple packages in parallel. Concurrency can be controlled by the "--concurrency" option. Fixes jcansdale#30

peters mentioned this pull request Jun 15, 2020

Add support for wildcards when pushing #55

Closed

peters changed the title ~~Add support for overriding repository url and version~~ Add support for overriding repository url, version and uploading multiple packages simultaneously using a glob pattern (wildcards) Jun 15, 2020

peters added 2 commits June 15, 2020 15:07

Remove all whitespace tokens after reading access token.

554e459

Add test case that proves whitespace is removed from repository url.

a114198

peters requested a review from jcansdale June 15, 2020 13:10

peters added 2 commits June 15, 2020 15:17

Add shorthand syntax for new push command options.

7677bb7

Fix bad formatting.

c3cb47a

jcansdale reviewed Jun 15, 2020

View reviewed changes

src/GprTool/Program.cs Show resolved Hide resolved

Merge branch 'master' into issue-48

1f417fd

# Conflicts: # src/GprTool/Program.cs

Add additional test cases.

328a018

peters added 2 commits June 16, 2020 18:19

If PackageFilename is a directory then we should by default upload al…

daf0551

…l .nupkg, .snupkg files found in current working directory.

Implicitly cast workingdirectory to string.

4a8df4c

Use full path in glob

623bfce

peters added 2 commits June 16, 2020 23:37

Refactor: Expand path before parsing glob pattern. Added test cases f…

04fd2b4

…or expanding both relative and absolute glob patterns.

Add additional test cases.

8fd11e6

peters added 5 commits June 16, 2020 23:57

Update nuget packages. Maybe consider enabling depandabot? /cc @jcans…

be0e251

…dale

Enable running tests via commandline: dotnet test . --logger:nunit /p…

b94c540

…:IsRunningTests=True

Change package output path root solution directory.

4092898

Add global json.

9b823ad

Fix failing test cases on Unix.

38b72ee

jcansdale approved these changes Jun 17, 2020

View reviewed changes

src/GprTool/NuGetUtilities.cs Outdated Show resolved Hide resolved

PackageOutputPath is already defined in Directory.Build.Props.

9523c16

peters and others added 7 commits June 17, 2020 02:32

Update src/GprTool/NuGetUtilities.cs

8fac910

Co-authored-by: Jamie Cansdale <[email protected]>

Ignore nupkgs directory.

ec536b0

Merge branch 'issue-48' of https://github.com/peters/gpr into issue-48

d253600

Remove FilenameWithoutGprPrefix and use ".zip" extension when rewriti…

47f0409

…ng nupkg in order to avoid uploading previously written packages.

Add support for accepting multiple filenames (relative or absolute) a…

8af6bda

…s a glob pattern. Maybe also fixes jcansdale#57 ?

Enable OSX support.

237eef7

Update test syntax because packages list may be sorted differently ba…

0294e2c

…sed on the underlying OS.

jcansdale merged commit 7467f0d into jcansdale:master Jun 17, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for overriding repository url, version and uploading multiple packages simultaneously using a glob pattern (wildcards) #53

Add support for overriding repository url, version and uploading multiple packages simultaneously using a glob pattern (wildcards) #53

peters commented Jun 12, 2020 •

edited

Loading

jcansdale left a comment

jcansdale left a comment •

edited

Loading

peters commented Jun 15, 2020

jcansdale left a comment

peters commented Jun 15, 2020

jcansdale commented Jun 15, 2020

peters commented Jun 15, 2020

jcansdale commented Jun 16, 2020

jcansdale commented Jun 16, 2020

peters commented Jun 16, 2020

jcansdale left a comment

peters commented Jun 17, 2020 •

edited

Loading

peters commented Jun 17, 2020 •

edited

Loading

peters commented Jun 17, 2020

jcansdale commented Jun 17, 2020

peters commented Jun 17, 2020

jcansdale commented Jun 17, 2020

Swoorup commented Nov 22, 2020 •

edited

Loading

Add support for overriding repository url, version and uploading multiple packages simultaneously using a glob pattern (wildcards) #53

Add support for overriding repository url, version and uploading multiple packages simultaneously using a glob pattern (wildcards) #53

Conversation

peters commented Jun 12, 2020 • edited Loading

jcansdale left a comment

Choose a reason for hiding this comment

jcansdale left a comment • edited Loading

Choose a reason for hiding this comment

peters commented Jun 15, 2020

jcansdale left a comment

Choose a reason for hiding this comment

peters commented Jun 15, 2020

jcansdale commented Jun 15, 2020

peters commented Jun 15, 2020

jcansdale commented Jun 16, 2020

jcansdale commented Jun 16, 2020

peters commented Jun 16, 2020

jcansdale left a comment

Choose a reason for hiding this comment

peters commented Jun 17, 2020 • edited Loading

peters commented Jun 17, 2020 • edited Loading

peters commented Jun 17, 2020

jcansdale commented Jun 17, 2020

peters commented Jun 17, 2020

jcansdale commented Jun 17, 2020

Swoorup commented Nov 22, 2020 • edited Loading

peters commented Jun 12, 2020 •

edited

Loading

jcansdale left a comment •

edited

Loading

peters commented Jun 17, 2020 •

edited

Loading

peters commented Jun 17, 2020 •

edited

Loading

Swoorup commented Nov 22, 2020 •

edited

Loading