Merge branch 'dev'

build.msbuild

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v$(MSBuildToolsVersion).dll">
+	<PropertyGroup>
+		<MsBuildTasksAssembly Condition="Exists('$(MSBuildToolsPath)\Microsoft.Build.Tasks.v$(MSBuildToolsVersion).dll')">$(MSBuildToolsPath)\Microsoft.Build.Tasks.v$(MSBuildToolsVersion).dll</MsBuildTasksAssembly>
+		<MsBuildTasksAssembly Condition="Exists('$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll')">$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll</MsBuildTasksAssembly>
+	</PropertyGroup>
+
+    <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MsBuildTasksAssembly)">
        <ParameterGroup>
            <OutputFilename ParameterType="System.String" Required="true" />
        </ParameterGroup>

src/NuGet.Services.Search.Client/Client/RetryingHttpClientWrapper.cs

@@ -202,8 +202,7 @@ private static bool ShouldTryOther(Exception ex)
 
         private static bool ShouldTryOther(HttpResponseMessage response)
         {
-            if (response.IsSuccessStatusCode
-                || response.StatusCode == HttpStatusCode.BadGateway
+            if (response.StatusCode == HttpStatusCode.BadGateway
                 || response.StatusCode == HttpStatusCode.GatewayTimeout
                 || response.StatusCode == HttpStatusCode.ServiceUnavailable
                 || response.StatusCode == HttpStatusCode.RequestTimeout

src/NuGetGallery/Helpers/StringExtensions.cs

@@ -3,6 +3,8 @@
 
 using System;
 using System.Globalization;
+using System.Web;
+using System.Web.Mvc;
 
 namespace NuGetGallery.Helpers
 {
@@ -41,17 +43,17 @@ public static string Abbreviate(this string text, int length)
             return text.Substring(0, length - 3) + "...";
         }
 
-        public static string TruncateAtWordBoundary(this string input, int length = 300, string ommission = "...", string morText = "")
+        public static MvcHtmlString TruncateAtWordBoundary(this string input, int length = 300, string ommission = "...", string moreText = "")
         {
             if (string.IsNullOrEmpty(input) || input.Length < length)
-                return input;
+                return new MvcHtmlString(input);
 
             int nextSpace = input.LastIndexOf(" ", length, StringComparison.Ordinal);
 
-            return string.Format(CultureInfo.CurrentCulture, "{2}{1}{0}",
-                                 morText,
+            return new MvcHtmlString(string.Format(CultureInfo.CurrentCulture, "{2}{1}{0}",
+                                 moreText,
                                  ommission,
-                                 input.Substring(0, (nextSpace > 0) ? nextSpace : length).Trim());
+                                 HttpUtility.HtmlEncode(input.Substring(0, (nextSpace > 0) ? nextSpace : length).Trim())));
         }
     }
 }

src/NuGetGallery/Views/Shared/_ListPackage.cshtml

@@ -25,7 +25,7 @@
                 </span>
             </p>
             <p>
-                @Html.Raw(Model.Description.TruncateAtWordBoundary(350, "<text>... </text>", string.Format(System.Globalization.CultureInfo.CurrentCulture, "<a href=\"{0}\">More information</a>", @Url.Package(Model))))
+                @Model.Description.TruncateAtWordBoundary(350, "...", string.Format(System.Globalization.CultureInfo.CurrentCulture, " <a href=\"{0}\">More information</a>", @Url.Package(Model)))
             </p>
 
             @if (!String.IsNullOrEmpty(Model.MinClientVersion))