Report group name in download trace - closes #1337

fsprojects · Jan 4, 2016 · d791401 · d791401
1 parent 672a39c
commit d791401
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 2.40.4 - 03.01.2016
+* USABILITY: Report group name in download trace - https://github.com/fsprojects/Paket/issues/1337
+
 #### 2.40.3 - 03.01.2016
 * PERFORMANCE: Don't parse lock file in FullUpdate mode
 

diff --git a/integrationtests/Paket.IntegrationTests/PaketCoreSpecs.fs b/integrationtests/Paket.IntegrationTests/PaketCoreSpecs.fs
@@ -45,4 +45,4 @@ let ``#1259 install via script``() =
 
     let lockFile = LockFile.LoadFrom(Path.Combine(scenarioTempPath "i001259-install-script","paket.lock"))
     lockFile.Groups.[Constants.MainDependencyGroup].Resolution.[PackageName "Suave"].Version
-    |> shouldEqual (SemVer.Parse "0.33.0")
+    |> shouldBeGreaterThan (SemVer.Parse "0.33.0")
diff --git a/src/Paket.Core/InstallProcess.fs b/src/Paket.Core/InstallProcess.fs
@@ -134,7 +134,8 @@ let CreateInstallModel(root, groupName, sources, force, package) =
         let files = files |> Array.map (fun fi -> fi.FullName)
         let targetsFiles = targetsFiles |> Array.map (fun fi -> fi.FullName)
         let analyzerFiles = analyzerFiles |> Array.map (fun fi -> fi.FullName)
-        return (groupName,package.Name), (package,InstallModel.CreateFromLibs(package.Name, package.Version, package.Settings.FrameworkRestrictions, files, targetsFiles, analyzerFiles, nuspec))
+        let model = InstallModel.CreateFromLibs(package.Name, package.Version, package.Settings.FrameworkRestrictions, files, targetsFiles, analyzerFiles, nuspec)
+        return (groupName,package.Name), (package,model)
     }
 
 /// Restores the given packages from the lock file.

diff --git a/src/Paket.Core/NuGetV2.fs b/src/Paket.Core/NuGetV2.fs
@@ -635,10 +635,10 @@ let DownloadPackage(root, (source : PackageSource), groupName, packageName:Packa
         let licenseFileName = Path.Combine(CacheFolder, packageName.ToString() + "." + version.Normalize() + ".license.html")
         if not force && targetFile.Exists && targetFile.Length > 0L then 
             verbosefn "%O %O already downloaded." packageName version
-        else 
-            tracefn "Downloading %O %O" packageName version
+        else
+            tracefn "Downloading %O %O%s" packageName version (if groupName = Constants.MainDependencyGroup then "" else sprintf " (%O)" groupName)
             verbosefn "  to %s" targetFileName
-            
+
             // discover the link on the fly
             let nugetPackage = GetPackageDetails root force [source] packageName version
             try 

diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj
@@ -38,7 +38,7 @@
     <StartArguments>pack output D:\code\paketbug\output</StartArguments>
     <StartArguments>install</StartArguments>
     <StartArguments>restore</StartArguments>
-    <StartArguments>update</StartArguments>
+    <StartArguments>update -f</StartArguments>
     <StartAction>Project</StartAction>
     <StartProgram>paket.exe</StartProgram>
     <StartWorkingDirectory>c:\code\Paketkopie</StartWorkingDirectory>
@@ -48,7 +48,7 @@
     <StartWorkingDirectory>d:\code\paketrepro</StartWorkingDirectory>
     <StartWorkingDirectory>D:\code\Paket\integrationtests\scenarios\i001270-net461\temp</StartWorkingDirectory>
     <StartWorkingDirectory>C:\code\restore</StartWorkingDirectory>
-    <StartWorkingDirectory>C:\code\Paket\integrationtests\scenarios\i001334-download-fail\temp</StartWorkingDirectory>
+    <StartWorkingDirectory>D:\code\FSharpVSPowerTools\</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>