Skip to content

Support for only using nuget v3 api #1205

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 6 commits into from
Nov 11, 2015
Merged

Support for only using nuget v3 api #1205

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
622a18a
Support for only using nuget v3 api.
xavierzwirtz Nov 7, 2015
a469dca
Merge remote-tracking branch 'origin/master' into nuget-v3
xavierzwirtz Nov 9, 2015
a093443
Fixed restore after paket.lock is created.
xavierzwirtz Nov 9, 2015
2414c63
Added final new line to push request.
xavierzwirtz Nov 10, 2015
f6e92c3
Removed dependency on Nuget.Versioning.
xavierzwirtz Nov 11, 2015
ac40c17
Added handling for [2.2,) version ranges.
xavierzwirtz Nov 11, 2015
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into nuget-v3
  • Loading branch information
@xavierzwirtz
xavierzwirtz committed Nov 9, 2015
commit a469dcae8b78ae7d169c9788abb6be1b5d05b4ef
1 change: 0 additions & 1 deletion paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ source https://nuget.org/api/v2
nuget Newtonsoft.Json redirects: on
nuget Argu
nuget FSharp.Core redirects: on
nuget NUnit
nuget NuGet.Versioning

@forki forki Nov 11, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we need this?

@forki forki Nov 11, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah "Adds a reference to NuGet.Versioning so that we can reuse there parsing logic for the new version range syntax."

I don't think that's a good idea. we already have parse logic and I think we should take that dependency. We're much faster with fixes if this little parse code is under our control.


github fsharp/FAKE src/app/FakeLib/Globbing/Globbing.fs
Expand Down
1 change: 0 additions & 1 deletion paket.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ NUGET
System.Reflection (>= 4.0.10-beta-23109)
System.Resources.ResourceManager (>= 4.0.0-beta-23109)
System.Runtime.Extensions (>= 4.0.10-beta-23109)
NUnit (2.6.4)
System.Collections (4.0.10) - framework: dnxcore50
System.Diagnostics.Debug (>= 4.0.0)
System.Resources.ResourceManager (>= 4.0.0)
Expand Down
8 changes: 4 additions & 4 deletions src/Paket.Bootstrapper/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
[assembly: AssemblyTitleAttribute("Paket.Bootstrapper")]
[assembly: AssemblyProductAttribute("Paket")]
[assembly: AssemblyDescriptionAttribute("A package dependency manager for .NET with support for NuGet packages and GitHub repositories.")]
[assembly: AssemblyVersionAttribute("2.23.0")]
[assembly: AssemblyFileVersionAttribute("2.23.0")]
[assembly: AssemblyInformationalVersionAttribute("2.23.0")]
[assembly: AssemblyVersionAttribute("2.12.3")]
[assembly: AssemblyFileVersionAttribute("2.12.3")]
[assembly: AssemblyInformationalVersionAttribute("2.12.3")]
namespace System {
internal static class AssemblyVersionInformation {
internal const string Version = "2.23.0";
internal const string Version = "2.12.3";
}
}
8 changes: 4 additions & 4 deletions src/Paket.Core/AssemblyInfo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ open System.Reflection
[<assembly: AssemblyProductAttribute("Paket")>]
[<assembly: AssemblyCompanyAttribute("Paket team")>]
[<assembly: AssemblyDescriptionAttribute("A package dependency manager for .NET with support for NuGet packages and GitHub repositories.")>]
[<assembly: AssemblyVersionAttribute("2.23.0")>]
[<assembly: AssemblyFileVersionAttribute("2.23.0")>]
[<assembly: AssemblyInformationalVersionAttribute("2.23.0")>]
[<assembly: AssemblyVersionAttribute("2.12.3")>]
[<assembly: AssemblyFileVersionAttribute("2.12.3")>]
[<assembly: AssemblyInformationalVersionAttribute("2.12.3")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] Version = "2.23.0"
let [<Literal>] Version = "2.12.3"
2 changes: 1 addition & 1 deletion src/Paket.Core/Constants.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let DefaultNugetStream = "https://nuget.org/api/v2"
let DefaultNugetV3Stream = "http://api.nuget.org/v3/index.json"

[<Literal>]
let GithubReleasesUrl = "https://api.github.com/repos/fsprojects/Paket/releases"
let GitHubReleasesUrl = "https://api.github.com/repos/fsprojects/Paket/releases"

[<Literal>]
let GithubReleaseDownloadUrl = "https://github.com/fsprojects/Paket/releases/download"
Expand Down
23 changes: 13 additions & 10 deletions src/Paket.Core/NuGetV2.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,16 +584,19 @@ let GetPackageDetails root force sources packageName (version:SemVerInfo) : Pack
|> List.map (fun source -> async {
try
match source with
| Nuget source ->
getDetailsFromNuGet
force
(source.Authentication |> Option.map toBasicAuth)
source.Url
packageName
version
|> Async.RunSynchronously
| NugetV3 source ->
NuGetV3.GetPackageDetails source packageName version |> Async.RunSynchronously
| Nuget nugetSource ->
let! result =
getDetailsFromNuGet
force
(nugetSource.Authentication |> Option.map toBasicAuth)
nugetSource.Url
packageName
version
return Some(source,result)
| NugetV3 nugetSource ->
let! result =
NuGetV3.GetPackageDetails nugetSource packageName version
return Some(source,result)
| LocalNuget path ->
let! result = getDetailsFromLocalFile root path packageName version
return Some(source,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 @@ -205,4 +205,4 @@ let GetPackageDetails (source : NugetV3Source) (packageName:PackageName) (versio
use dependencyGroups to get the dependencies for the package
use licenseUrl
use listed
*)
*)
2 changes: 1 addition & 1 deletion src/Paket.Core/VersionRange.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ type VersionRequirement =
override this.ToString() = this.Range.ToString()

/// Parses NuGet V2 version range
static member Parse text =
static member Parse text =
if String.IsNullOrWhiteSpace text || text = "null" then VersionRequirement.AllReleases else

let prereleases = ref PreReleaseStatus.No
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.