Merge branch 'master' into v3

# 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 · May 24, 2016 · 8456ddc · 8456ddc
2 parents aa821de + 85f5185
commit 8456ddc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,4 +1,4 @@
-#### 3.0.0-beta052 - 23.05.2016
+#### 3.0.0-beta053 - 24.05.2016
 * Allow to reference git repositories - http://fsprojects.github.io/Paket/git-dependencies.html
 * Allow to run build commands on git repositories - http://fsprojects.github.io/Paket/git-dependencies.html#Running-a-build-in-git-repositories
 * Allow to use git repositories as NuGet source - http://fsprojects.github.io/Paket/git-dependencies.html#Using-Git-repositories-as-NuGet-source
@@ -15,6 +15,9 @@
     - Paket threads all commands as if --hard would have been set - https://github.com/fsprojects/Paket/pull/1567
     - For the --hard use in the binding redirects there is a new parameter --clean-redirects - https://github.com/fsprojects/Paket/pull/1692 
 
+#### 2.66.3 - 24.05.2016
+* BUGFIX: Use utf-8 to download strings - https://github.com/fsprojects/Paket/pull/1702
+
 #### 2.66.2 - 23.05.2016
 * BUGFIX: Update with any of the --keep-major flag didn't honour content:none in paket.dependencies - https://github.com/fsprojects/Paket/issues/1701
 

diff --git a/src/Paket.Core/NupkgWriter.fs b/src/Paket.Core/NupkgWriter.fs
@@ -71,7 +71,8 @@ let nuspecDoc (info:CompleteInfo) =
 
     let buildFrameworkReferencesNode libName =
         let element = XElement(ns + "frameworkAssembly")
-        element.SetAttributeValue(XName.Get "assemblyName", libName)
+        if String.IsNullOrEmpty libName then () else
+            element.SetAttributeValue(XName.Get "assemblyName", libName)
         element
 
     let buildFrameworkReferencesNode frameworkAssembliesList =

diff --git a/src/Paket.Core/Utils.fs b/src/Paket.Core/Utils.fs
@@ -417,6 +417,7 @@ let safeGetFromUrl (auth:Auth option, url : string, contentType : string) =
             if notNullOrEmpty contentType then
                 client.Headers.Add(HttpRequestHeader.Accept, contentType)
 
+            client.Encoding <- Encoding.UTF8
             let! raw = client.DownloadStringTaskAsync(uri) |> Async.AwaitTask
             return Some raw
         with _ -> return None