use v2 - temp fix for #2652

fsprojects · Aug 24, 2017 · c5c2719 · c5c2719
1 parent b7e31e3
commit c5c2719
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/Paket.Core/Dependencies/NuGet.fs b/src/Paket.Core/Dependencies/NuGet.fs
@@ -248,7 +248,18 @@ let rec private getPackageDetails alternativeProjectRoot root force (sources:Pac
                 version
 
         let tryV3 (nugetSource:NugetV3Source) force =
-            NuGetV3.GetPackageDetails force nugetSource packageName version
+            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 ->
+                    NuGetV2.getDetailsFromNuGet
+                        force
+                        { nugetSource with Url = url } //= .Authentication |> Option.map toBasicAuth)
+                        packageName
+                        version
+                | _ ->
+                    NuGetV3.GetPackageDetails force nugetSource packageName version
+            else
+                NuGetV3.GetPackageDetails force nugetSource packageName version
 
         let getPackageDetails force =
             // helper to work through the list sequentially

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -31,8 +31,8 @@
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
     <StartAction>Project</StartAction>
-    <StartArguments>update</StartArguments>
-    <StartWorkingDirectory>C:\proj\testing\testpaketfailure\</StartWorkingDirectory>
+    <StartArguments>update -f</StartArguments>
+    <StartWorkingDirectory>C:\temp\fixed</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>true</Optimize>