From 1864f7f290910b120154a8fa2ed887567c70e807 Mon Sep 17 00:00:00 2001 From: DCorriveau Date: Mon, 18 Jan 2016 13:38:17 -0500 Subject: [PATCH 1/6] Find packages is now case-insensitive #93 --- src/Paket.Core/NuGetV2.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Paket.Core/NuGetV2.fs b/src/Paket.Core/NuGetV2.fs index 641a9f94e1..a8abfa9382 100644 --- a/src/Paket.Core/NuGetV2.fs +++ b/src/Paket.Core/NuGetV2.fs @@ -546,7 +546,7 @@ let getVersionsCached key f (source, auth, nugetURL, package) = let FindPackages(auth, nugetURL, packageNamePrefix, maxResults) = async { try - let url = sprintf "%s/Packages()?$filter=IsLatestVersion and IsAbsoluteLatestVersion and substringof('%s',Id)" nugetURL packageNamePrefix + let url = sprintf "%s/Packages()?$filter=IsLatestVersion and IsAbsoluteLatestVersion and substringof('%s',tolower(Id))" nugetURL ((packageNamePrefix:string).ToLowerInvariant()) let! raw = getFromUrl(auth |> Option.map toBasicAuth,url,acceptXml) let doc = XmlDocument() doc.LoadXml raw From 1a66e2ce08684a51afdb0a6ccccfaa0dc40d6b6f Mon Sep 17 00:00:00 2001 From: DCorriveau Date: Mon, 18 Jan 2016 13:56:02 -0500 Subject: [PATCH 2/6] Added FAKE reference to IntegrationTests project --- integrationtests/Paket.IntegrationTests/paket.references | 1 + paket.dependencies | 1 + paket.lock | 1 + 3 files changed, 3 insertions(+) diff --git a/integrationtests/Paket.IntegrationTests/paket.references b/integrationtests/Paket.IntegrationTests/paket.references index cf24b2ccb1..722e12b795 100644 --- a/integrationtests/Paket.IntegrationTests/paket.references +++ b/integrationtests/Paket.IntegrationTests/paket.references @@ -6,3 +6,4 @@ group Test NUnit NUnit.Runners.Net4 File:FsUnit.fs . + FAKE \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index 8beebaa10c..28ac694849 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -22,6 +22,7 @@ group Test source https://nuget.org/api/v2 + nuget FAKE nuget NUnit.Runners.Net4 nuget NUnit ~> 2 github forki/FsUnit FsUnit.fs \ No newline at end of file diff --git a/paket.lock b/paket.lock index 2ba891bb9a..82b8ec3d5f 100644 --- a/paket.lock +++ b/paket.lock @@ -42,6 +42,7 @@ GROUP Test NUGET remote: https://www.nuget.org/api/v2 specs: + FAKE (4.14.9) NUnit (2.6.4) NUnit.Runners.Net4 (2.6.4) GITHUB From ac0cb68fbd08fe375b0d2846c21a3347d2a04559 Mon Sep 17 00:00:00 2001 From: DCorriveau Date: Mon, 18 Jan 2016 14:27:18 -0500 Subject: [PATCH 3/6] Reverted previous fix --- src/Paket.Core/NuGetV2.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Paket.Core/NuGetV2.fs b/src/Paket.Core/NuGetV2.fs index a8abfa9382..d72a9dbd24 100644 --- a/src/Paket.Core/NuGetV2.fs +++ b/src/Paket.Core/NuGetV2.fs @@ -546,7 +546,7 @@ let getVersionsCached key f (source, auth, nugetURL, package) = let FindPackages(auth, nugetURL, packageNamePrefix, maxResults) = async { try - let url = sprintf "%s/Packages()?$filter=IsLatestVersion and IsAbsoluteLatestVersion and substringof('%s',tolower(Id))" nugetURL ((packageNamePrefix:string).ToLowerInvariant()) + let url = sprintf "%s/Packages()?$filter=IsLatestVersion and IsAbsoluteLatestVersion and substringof('%s',Id)" nugetURL packageNamePrefix let! raw = getFromUrl(auth |> Option.map toBasicAuth,url,acceptXml) let doc = XmlDocument() doc.LoadXml raw From 9e3a5c10f388790198c209b3fbe1a5a01a106c99 Mon Sep 17 00:00:00 2001 From: DCorriveau Date: Mon, 18 Jan 2016 14:28:43 -0500 Subject: [PATCH 4/6] Added trailing space --- src/Paket.Core/NuGetV2.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Paket.Core/NuGetV2.fs b/src/Paket.Core/NuGetV2.fs index d72a9dbd24..641a9f94e1 100644 --- a/src/Paket.Core/NuGetV2.fs +++ b/src/Paket.Core/NuGetV2.fs @@ -546,7 +546,7 @@ let getVersionsCached key f (source, auth, nugetURL, package) = let FindPackages(auth, nugetURL, packageNamePrefix, maxResults) = async { try - let url = sprintf "%s/Packages()?$filter=IsLatestVersion and IsAbsoluteLatestVersion and substringof('%s',Id)" nugetURL packageNamePrefix + let url = sprintf "%s/Packages()?$filter=IsLatestVersion and IsAbsoluteLatestVersion and substringof('%s',Id)" nugetURL packageNamePrefix let! raw = getFromUrl(auth |> Option.map toBasicAuth,url,acceptXml) let doc = XmlDocument() doc.LoadXml raw From a30cc6a4fba0d28f9d630969da15926b1fd3dfb6 Mon Sep 17 00:00:00 2001 From: DCorriveau Date: Mon, 18 Jan 2016 15:12:56 -0500 Subject: [PATCH 5/6] Reverted FAKE fix --- integrationtests/Paket.IntegrationTests/paket.references | 3 +-- paket.dependencies | 1 - paket.lock | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/integrationtests/Paket.IntegrationTests/paket.references b/integrationtests/Paket.IntegrationTests/paket.references index 722e12b795..6d43592eb3 100644 --- a/integrationtests/Paket.IntegrationTests/paket.references +++ b/integrationtests/Paket.IntegrationTests/paket.references @@ -5,5 +5,4 @@ Newtonsoft.Json group Test NUnit NUnit.Runners.Net4 - File:FsUnit.fs . - FAKE \ No newline at end of file + File:FsUnit.fs . \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index 28ac694849..8beebaa10c 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -22,7 +22,6 @@ group Test source https://nuget.org/api/v2 - nuget FAKE nuget NUnit.Runners.Net4 nuget NUnit ~> 2 github forki/FsUnit FsUnit.fs \ No newline at end of file diff --git a/paket.lock b/paket.lock index 82b8ec3d5f..2ba891bb9a 100644 --- a/paket.lock +++ b/paket.lock @@ -42,7 +42,6 @@ GROUP Test NUGET remote: https://www.nuget.org/api/v2 specs: - FAKE (4.14.9) NUnit (2.6.4) NUnit.Runners.Net4 (2.6.4) GITHUB From 41f573048eb2a1e79cf25376ad1ceb9cda800f15 Mon Sep 17 00:00:00 2001 From: DCorriveau Date: Mon, 18 Jan 2016 15:20:55 -0500 Subject: [PATCH 6/6] Added FAKE reference for the Build group --- integrationtests/Paket.IntegrationTests/paket.references | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/integrationtests/Paket.IntegrationTests/paket.references b/integrationtests/Paket.IntegrationTests/paket.references index 6d43592eb3..48b6787bac 100644 --- a/integrationtests/Paket.IntegrationTests/paket.references +++ b/integrationtests/Paket.IntegrationTests/paket.references @@ -5,4 +5,7 @@ Newtonsoft.Json group Test NUnit NUnit.Runners.Net4 - File:FsUnit.fs . \ No newline at end of file + File:FsUnit.fs . + +group Build + FAKE \ No newline at end of file