Skip to content

extending NuGetV3 source detection with Artifactory feed format #3267

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.

Sign up for GitHub

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

Merged
forki merged 3 commits into from
Jun 28, 2018
Merged

extending NuGetV3 source detection with Artifactory feed format #3267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f279a80
Merge upstream master/5.171.0 from fsprojects/Paket
viktor-svub Jun 7, 2018
90d4927
Merge upstream master/5.172.2 from fsprojects/Paket
viktor-svub Jun 15, 2018
7b9e061
extending NuGetV3 source detection with Artifactory feed format
viktor-svub Jun 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Paket.Core/Versioning/PackageSources.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ type PackageSource =
#endif
LocalNuGet(source,None)
else
if String.endsWithIgnoreCase "v3/index.json" source then
if Regex("/v3(?:/[-\w]+)?/index.json$").IsMatch source then
NuGetV3 { Url = source; Authentication = auth }
else
NuGetV2 { Url = source; Authentication = auth }
Expand Down
1 change: 1 addition & 0 deletions tests/Paket.Tests/Paket.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
<Paket>True</Paket>
<Link>FsUnit.fs</Link>
</Compile>
<Compile Include="Versioning\PackageSourceSpecs.fs" />
<None Include="paket.references" />
<Compile Include="AssemblyInfo.fs" />
<Compile Include="TestHelpers.fs" />
Expand Down
40 changes: 40 additions & 0 deletions tests/Paket.Tests/Versioning/PackageSourceSpecs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
module Paket.PackageSourceSpecs

open Paket
open NUnit.Framework
open FsUnit
open Paket.Domain
open Paket.PackageSources

[<TestCase("https://nuget.org/api/v2")>]
[<TestCase("https://nuget.org/api/v2/")>]
[<TestCase("https://www.myget.org/F/roslyn-tools/")>]
[<TestCase("http://my.domain/artifactory/api/nuget/nugetsource/")>]
[<TestCase("http://my.domain/artifactory/api/nuget/nuget-local/")>]
[<TestCase("http://my.domain/artifactory/api/nuget/nuget_proxy/")>]
let ``should parse known nuget2 source``(feed : string) =
let line = sprintf "source %s" feed
match PackageSource.Parse(line) with
| NuGetV2 { Url = source; Authentication = _ } ->
let quoted = sprintf "source \"%s\"" feed
match PackageSource.Parse(quoted) with
| NuGetV2 { Url = qsource; Authentication = _ } ->
source |> shouldEqual qsource
| _ -> failwith quoted
| _ -> failwith feed

[<TestCase("https://api.nuget.org/v3/index.json")>]
[<TestCase("https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json")>]
[<TestCase("http://my.domain/artifactory/api/nuget/v3/nugetsource/index.json")>]
[<TestCase("http://my.domain/artifactory/api/nuget/v3/nuget-local/index.json")>]
[<TestCase("http://my.domain/artifactory/api/nuget/v3/nuget_proxy/index.json")>]
let ``should parse known nuget3 source``(feed : string) =
let line = sprintf "source %s" feed
match PackageSource.Parse(line) with
| NuGetV3 { Url = source; Authentication = _ } ->
let quoted = sprintf "source \"%s\"" feed
match PackageSource.Parse(quoted) with
| NuGetV3 { Url = qsource; Authentication = _ } ->
source |> shouldEqual qsource
| _ -> failwith quoted
| _ -> failwith feed