Putting braces around OData conditions to work around ProGet issues -…

… references #1225
fsprojects · Nov 18, 2015 · 934f687 · 934f687
1 parent cd8e665
commit 934f687
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,11 +1,12 @@
-#### 2.26.0-alpha009 - 17.11.2015
+#### 2.26.0 - 18.11.2015
 * Try all 4 NuGet APIs for "GetPackageDetails" in parallel - https://github.com/fsprojects/Paket/issues/1225
 * BUGFIX: Better parsing of framework restrictions - https://github.com/fsprojects/Paket/issues/1232
 * BUGFIX: Fix props files - https://github.com/fsprojects/Paket/issues/1233
 * BUGFIX: Detect AssemblyName from project file name if empty - https://github.com/fsprojects/Paket/issues/1234
 * BUGFIX: Fixed issue with V3 feeds doing api requests even when the paket.lock is fully specified - https://github.com/fsprojects/Paket/pull/1231
 * BUGFIX: Update ProjectFile.GetTargetProfile to work with conditional nodes - https://github.com/fsprojects/Paket/pull/1227
 * BUGFIX: Putting .targets import on correct location in project files - https://github.com/fsprojects/Paket/issues/1226
+* BUGFIX: Putting braces around OData conditions to work around ProGet issues - https://github.com/fsprojects/Paket/issues/1225
 * USABILITY: Always write nomalized version into lock file to keep the lockfile as stable as possible
 * USABILITY: Always try 3 times to download and extract a package
 * USABILITY: Sets default resolver strategy for convert from nuget to None - https://github.com/fsprojects/Paket/pull/1228

diff --git a/src/Paket.Core/NuGetV2.fs b/src/Paket.Core/NuGetV2.fs
@@ -186,7 +186,7 @@ let parseODataDetails(nugetURL,packageName:PackageName,version,raw) =
 let getDetailsFromNuGetViaOData auth nugetURL (packageName:PackageName) (version:SemVerInfo) = 
     let checkODataWithNormalizedVersion = async {
         try
-            let url = sprintf "%s/Packages?$filter=Id eq '%O' and NormalizedVersion eq '%s'" nugetURL packageName (version.Normalize())
+            let url = sprintf "%s/Packages?$filter=(Id eq '%O') and (NormalizedVersion eq '%s')" nugetURL packageName (version.Normalize())
             let! raw = getFromUrl(auth,url,acceptXml)
             if verbose then
                 tracefn "Response from %s:" url
@@ -198,7 +198,7 @@ let getDetailsFromNuGetViaOData auth nugetURL (packageName:PackageName) (version
 
     let checkODataWithVersion = async {
         try
-            let url = sprintf "%s/Packages?$filter=Id eq '%O' and Version eq '%O'" nugetURL packageName version
+            let url = sprintf "%s/Packages?$filter=(Id eq '%O') and (Version eq '%O')" nugetURL packageName version
             let! raw = getFromUrl(auth,url,acceptXml)
             if verbose then
                 tracefn "Response from %s:" url