Merge branch 'master' into proxy

Conflicts: RELEASE_NOTES.md src/Paket.Bootstrapper/Properties/AssemblyInfo.cs src/Paket.Core/AssemblyInfo.fs src/Paket.PowerShell/AssemblyInfo.fs src/Paket/AssemblyInfo.fs
fsprojects · Oct 21, 2015 · a3ee2fd · a3ee2fd
2 parents 47346f5 + afb6fed
commit a3ee2fd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,9 +1,10 @@
-#### 2.16.0-alpha003 - 20.10.2015
+#### 2.16.0-alpha004 - 21.10.2015
 * Log Request performance
 * Check that download http status code was 200
 * Try to report better error when file is blocked by Firewall - https://github.com/fsprojects/Paket/pull/1155
 * BUGFIX: Fixed loading of Project files on mono - https://github.com/fsprojects/Paket/pull/1149
 * PERFORMANCE: Caching proxy scheme - https://github.com/fsprojects/Paket/pull/1153
+* USABILITY: If caching fails we should recover - https://github.com/fsprojects/Paket/issues/1152
 
 #### 2.15.1 - 17.10.2015
 * BUGFIX: Fixed framework restriction filter - https://github.com/fsprojects/Paket/pull/1146

diff --git a/src/Paket.Core/NuGetV2.fs b/src/Paket.Core/NuGetV2.fs
@@ -294,7 +294,10 @@ let getDetailsFromNuGet force auth nugetURL (packageName:PackageName) (version:S
 
             errorFile.Delete()
             if invalidCache then
-                File.WriteAllText(cacheFile.FullName,JsonConvert.SerializeObject(details))
+                try
+                    File.WriteAllText(cacheFile.FullName,JsonConvert.SerializeObject(details))
+                with
+                | _ -> () // if caching fails we should not fail
             return details
         with
         | exn ->