Sitelet https://github.com/fsprojects/Paket/pull/2147/files
Skip to content

fix #2138 #2147

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
Feb 17, 2017
Merged

fix #2138 #2147

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
55be91a
fix #2138
drwatson1 Feb 17, 2017
0187bfe
fix #2138
drwatson1 Feb 17, 2017
901a1b7
Merge branch 'issue2138' of https://github.com/drwatson1/Paket into i…
drwatson1 Feb 17, 2017
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/NuGetV2.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ let rec private getPackageDetails root force (sources:PackageSource list) packag
return Some(source,result) }

let tryV3 source nugetSource = async {
if nugetSource.Url.Contains("myget.org") || nugetSource.Url.Contains("nuget.org") || nugetSource.Url.Contains("visualstudio.com") then
if nugetSource.Url.Contains("myget.org") || nugetSource.Url.Contains("nuget.org") || nugetSource.Url.Contains("visualstudio.com") || nugetSource.Url.Contains("/nuget/v3/") then
match NuGetV3.calculateNuGet2Path nugetSource.Url with
| Some url ->
let! result =
Expand Down
2 changes: 1 addition & 1 deletion src/Paket.Core/NuGetV3.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ let calculateNuGet2Path(nugetUrl:string) =
| "https://api.nuget.org/v3/index.json" -> Some "https://nuget.org/api/v2"
| "http://api.nuget.org/v3/index.json" -> Some "http://www.nuget.org/api/v2"
| "https://api.nuget.org/v3/index.json" -> Some "https://www.nuget.org/api/v2"
| url when url.EndsWith("/nuget/v3/index.json") && url.Contains("pkgs.visualstudio.com") -> Some (url.Replace("/nuget/v3/index.json","/nuget/v2"))
| url when url.EndsWith("/nuget/v3/index.json") -> Some (url.Replace("/nuget/v3/index.json","/nuget/v2"))
| url when url.EndsWith("/api/v3/index.json") && url.Contains("visualstudio.com") -> Some (url.Replace("/api/v3/index.json",""))
| url when url.EndsWith("/api/v3/index.json") && url.Contains("myget.org") -> Some (url.Replace("/api/v3/index.json",""))
| url when url.EndsWith("v2") -> Some url
Expand Down