Merge branch 'master' into v3

# Conflicts:
#	RELEASE_NOTES.md
#	src/Paket.Bootstrapper/Properties/AssemblyInfo.cs
#	src/Paket.Core/AssemblyInfo.fs
#	src/Paket.PowerShell/AssemblyInfo.fs
#	src/Paket/AssemblyInfo.fs

Author: forki

Diff for: RELEASE_NOTES.md

@@ -1,4 +1,4 @@
-#### 3.0.0-beta061 - 02.06.2016
+#### 3.0.0-beta062 - 02.06.2016
 * Allow to reference git repositories - http://fsprojects.github.io/Paket/git-dependencies.html
 * Allow to run build commands on git repositories - http://fsprojects.github.io/Paket/git-dependencies.html#Running-a-build-in-git-repositories
 * Allow to use git repositories as NuGet source - http://fsprojects.github.io/Paket/git-dependencies.html#Using-Git-repositories-as-NuGet-source
@@ -17,7 +17,7 @@
     - Paket threads all commands as if --hard would have been set - https://github.com/fsprojects/Paket/pull/1567
     - For the --hard use in the binding redirects there is a new parameter --clean-redirects - https://github.com/fsprojects/Paket/pull/1692 
 
-#### 2.66.7 - 02.06.2016
+#### 2.66.8 - 02.06.2016
 * BUGFIX: Automatic prerelease expansion should not be done if explicit prereleases are requested - https://github.com/fsprojects/Paket/issues/1714
 
 #### 2.66.6 - 31.05.2016

Diff for: src/Paket.Core/PackageResolver.fs

@@ -350,7 +350,7 @@ let Resolve(getVersionsF, getPackageDetailsF, groupName:GroupName, globalStrateg
             else
                 if Seq.isEmpty !compatibleVersions then
                     let prereleaseStatus =
-                        if currentRequirement.Parent.IsRootRequirement() && currentRequirement.VersionRequirement.PreReleases <> PreReleaseStatus.No then
+                        if currentRequirement.Parent.IsRootRequirement() && currentRequirement.VersionRequirement <> VersionRequirement.AllReleases then
                             currentRequirement.VersionRequirement.PreReleases
                         else
                             PreReleaseStatus.All

Diff for: tests/Paket.Tests/Resolver/ConflictGraphSpecs.fs

@@ -141,4 +141,57 @@ let graphWithServers = [
 let ``should resolve simple config with servers``() = 
     let cfg = DependenciesFile.FromCode(configWithServers)
     let resolved = ResolveWithGraph(cfg,noSha1,VersionsFromGraphAsSeq graphWithServers, PackageDetailsFromGraph graphWithServers).[Constants.MainDependencyGroup].ResolvedPackages.GetModelOrFail()
+    getVersion resolved.[PackageName "My.Company.PackageC.Server"] |> shouldEqual "1.0.0-pre18038"
+
+let configWithServersWithRCRequirement = """
+source https://www.nuget.org/api/v2
+
+
+nuget My.Company.PackageA.Server rc
+nuget My.Company.PackageB.Server rc
+nuget My.Company.PackageC.Server rc"""
+
+[<Test>]
+let ``should resolve simple config with servers with RC requirement``() = 
+    let cfg = DependenciesFile.FromCode(configWithServersWithRCRequirement)
+    try
+        ResolveWithGraph(cfg,noSha1,VersionsFromGraphAsSeq graphWithServers, PackageDetailsFromGraph graphWithServers).[Constants.MainDependencyGroup].ResolvedPackages.GetModelOrFail()
+        |> ignore
+        failwith "expected exception"
+    with
+    | exn when exn.Message.Contains " Could not resolve package My.Company.PackageA.Server" -> ()
+
+let configWithServersWithVersionRequirement = """
+source https://www.nuget.org/api/v2
+
+
+nuget My.Company.PackageA.Server > 0.1
+nuget My.Company.PackageB.Server > 0.1
+nuget My.Company.PackageC.Server > 0.1"""
+
+
+[<Test>]
+let ``should resolve simple config with servers with version requirement``() = 
+    let cfg = DependenciesFile.FromCode(configWithServersWithVersionRequirement)
+    try
+        ResolveWithGraph(cfg,noSha1,VersionsFromGraphAsSeq graphWithServers, PackageDetailsFromGraph graphWithServers).[Constants.MainDependencyGroup].ResolvedPackages.GetModelOrFail()
+        |> ignore
+        failwith "expected exception"
+    with
+    | exn when exn.Message.Contains " Could not resolve package My.Company.PackageA.Server" -> ()
+
+
+let configWithServersWithoutVersionRequirement = """
+source https://www.nuget.org/api/v2
+
+
+nuget My.Company.PackageA.Server
+nuget My.Company.PackageB.Server
+nuget My.Company.PackageC.Server"""
+
+
+[<Test>]
+let ``should resolve simple config with servers without version requirement``() = 
+    let cfg = DependenciesFile.FromCode(configWithServersWithoutVersionRequirement)
+    let resolved = ResolveWithGraph(cfg,noSha1,VersionsFromGraphAsSeq graphWithServers, PackageDetailsFromGraph graphWithServers).[Constants.MainDependencyGroup].ResolvedPackages.GetModelOrFail()
     getVersion resolved.[PackageName "My.Company.PackageC.Server"] |> shouldEqual "1.0.0-pre18038"