yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8590 from umbraco/netcore/bugfix/get_rid_of_system_web

Browse Source 
Netcore: Get rid of System.Web in netcore and netstandard projects
This commit is contained in:
Shannon Deminick
2020-08-06 14:42:54 +10:00
committed by GitHub
parent 53d8cfcfe4 3ea7945f24
commit 9cafeaf39e
16 changed files with 44 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Core/IUmbracoContextFactory.cs
View File

@@ -1,5 +1,4 @@
using System.Web;

namespace Umbraco.Web
{
/// <summary>

4
src/Umbraco.Core/Install/InstallSteps/StarterKitCleanupStep.cs
View File

@@ -1,8 +1,8 @@
using System;
using System.IO;
using System.Linq;
using System.Net;
using System.Threading.Tasks;
using System.Web;
using Umbraco.Core.IO;
using Umbraco.Web.Install.Models;
@@ -33,7 +33,7 @@ namespace Umbraco.Web.Install.InstallSteps
private void CleanupInstallation(int packageId, string packageFile)
{
var zipFile = new FileInfo(Path.Combine(_ioHelper.MapPath(Core.Constants.SystemDirectories.Packages), HttpUtility.UrlDecode(packageFile)));
var zipFile = new FileInfo(Path.Combine(_ioHelper.MapPath(Core.Constants.SystemDirectories.Packages), WebUtility.UrlDecode(packageFile)));
if (zipFile.Exists)
zipFile.Delete();

22
src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs
View File

@@ -1,4 +1,4 @@
using System.Web;
using System.Net;
using Umbraco.Core.Strings;
namespace Umbraco.Core.Models.PublishedContent
@@ -79,7 +79,7 @@ namespace Umbraco.Core.Models.PublishedContent
// TODO: This method should be removed or moved to an extension method on HtmlHelper.
public IHtmlEncodedString IsFirst(string valueIfTrue, string valueIfFalse)
{
return new HtmlEncodedString(HttpUtility.HtmlEncode(IsFirst() ? valueIfTrue : valueIfFalse));
return new HtmlEncodedString(WebUtility.HtmlEncode(IsFirst() ? valueIfTrue : valueIfFalse));
}
/// <summary>
@@ -119,7 +119,7 @@ namespace Umbraco.Core.Models.PublishedContent
// TODO: This method should be removed or moved to an extension method on HtmlHelper.
public IHtmlEncodedString IsNotFirst(string valueIfTrue, string valueIfFalse)
{
return new HtmlEncodedString(HttpUtility.HtmlEncode(IsNotFirst() ? valueIfTrue : valueIfFalse));
return new HtmlEncodedString(WebUtility.HtmlEncode(IsNotFirst() ? valueIfTrue : valueIfFalse));
}
/// <summary>
@@ -160,7 +160,7 @@ namespace Umbraco.Core.Models.PublishedContent
// TODO: This method should be removed or moved to an extension method on HtmlHelper.
public IHtmlEncodedString IsIndex(int index, string valueIfTrue, string valueIfFalse)
{
return new HtmlEncodedString(HttpUtility.HtmlEncode(IsIndex(index) ? valueIfTrue : valueIfFalse));
return new HtmlEncodedString(WebUtility.HtmlEncode(IsIndex(index) ? valueIfTrue : valueIfFalse));
}
/// <summary>
@@ -201,7 +201,7 @@ namespace Umbraco.Core.Models.PublishedContent
// TODO: This method should be removed or moved to an extension method on HtmlHelper.
public IHtmlEncodedString IsModZero(int modulus, string valueIfTrue, string valueIfFalse)
{
return new HtmlEncodedString(HttpUtility.HtmlEncode(IsModZero(modulus) ? valueIfTrue : valueIfFalse));
return new HtmlEncodedString(WebUtility.HtmlEncode(IsModZero(modulus) ? valueIfTrue : valueIfFalse));
}
/// <summary>
@@ -243,7 +243,7 @@ namespace Umbraco.Core.Models.PublishedContent
// TODO: This method should be removed or moved to an extension method on HtmlHelper.
public IHtmlEncodedString IsNotModZero(int modulus, string valueIfTrue, string valueIfFalse)
{
return new HtmlEncodedString(HttpUtility.HtmlEncode(IsNotModZero(modulus) ? valueIfTrue : valueIfFalse));
return new HtmlEncodedString(WebUtility.HtmlEncode(IsNotModZero(modulus) ? valueIfTrue : valueIfFalse));
}
/// <summary>
@@ -285,7 +285,7 @@ namespace Umbraco.Core.Models.PublishedContent
// TODO: This method should be removed or moved to an extension method on HtmlHelper.
public IHtmlEncodedString IsNotIndex(int index, string valueIfTrue, string valueIfFalse)
{
return new HtmlEncodedString(HttpUtility.HtmlEncode(IsNotIndex(index) ? valueIfTrue : valueIfFalse));
return new HtmlEncodedString(WebUtility.HtmlEncode(IsNotIndex(index) ? valueIfTrue : valueIfFalse));
}
/// <summary>
@@ -323,7 +323,7 @@ namespace Umbraco.Core.Models.PublishedContent
// TODO: This method should be removed or moved to an extension method on HtmlHelper.
public IHtmlEncodedString IsLast(string valueIfTrue, string valueIfFalse)
{
return new HtmlEncodedString(HttpUtility.HtmlEncode(IsLast() ? valueIfTrue : valueIfFalse));
return new HtmlEncodedString(WebUtility.HtmlEncode(IsLast() ? valueIfTrue : valueIfFalse));
}
/// <summary>
@@ -362,7 +362,7 @@ namespace Umbraco.Core.Models.PublishedContent
// TODO: This method should be removed or moved to an extension method on HtmlHelper.
public IHtmlEncodedString IsNotLast(string valueIfTrue, string valueIfFalse)
{
return new HtmlEncodedString(HttpUtility.HtmlEncode(IsNotLast() ? valueIfTrue : valueIfFalse));
return new HtmlEncodedString(WebUtility.HtmlEncode(IsNotLast() ? valueIfTrue : valueIfFalse));
}
/// <summary>
@@ -400,7 +400,7 @@ namespace Umbraco.Core.Models.PublishedContent
// TODO: This method should be removed or moved to an extension method on HtmlHelper.
public IHtmlEncodedString IsEven(string valueIfTrue, string valueIfFalse)
{
return new HtmlEncodedString(HttpUtility.HtmlEncode(IsEven() ? valueIfTrue : valueIfFalse));
return new HtmlEncodedString(WebUtility.HtmlEncode(IsEven() ? valueIfTrue : valueIfFalse));
}
/// <summary>
@@ -438,7 +438,7 @@ namespace Umbraco.Core.Models.PublishedContent
// TODO: This method should be removed or moved to an extension method on HtmlHelper.
public IHtmlEncodedString IsOdd(string valueIfTrue, string valueIfFalse)
{
return new HtmlEncodedString(HttpUtility.HtmlEncode(IsOdd() ? valueIfTrue : valueIfFalse));
return new HtmlEncodedString(WebUtility.HtmlEncode(IsOdd() ? valueIfTrue : valueIfFalse));
}
}
}

1
src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs
View File

@@ -1,5 +1,4 @@
using System.Collections.Generic;
using System.Web;
using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.Services;

4
src/Umbraco.Core/Routing/RoutableAttemptEventArgs.cs
View File

@@ -1,6 +1,4 @@
using System.Web;
namespace Umbraco.Web.Routing
namespace Umbraco.Web.Routing
{
/// <summary>
/// Event args containing information about why the request was not routable, or if it is routable

1
src/Umbraco.Core/Routing/UmbracoRequestEventArgs.cs
View File

@@ -1,5 +1,4 @@
using System;
using System.Web;
namespace Umbraco.Web.Routing
{

1
src/Umbraco.Core/Routing/UriUtility.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Text;
using System.Web;
using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.UmbracoSettings;

4
src/Umbraco.Core/Templates/UmbracoComponentRenderer.cs
View File

@@ -1,9 +1,9 @@
using System;
using System.Linq;
using System.IO;
using System.Web;
using Umbraco.Web.Templates;
using System.Collections.Generic;
using System.Net;
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.Strings;
using Umbraco.Web;
@@ -120,7 +120,7 @@ namespace Umbraco.Core.Templates
//NOTE: the value could have HTML encoded values, so we need to deal with that
var macroProps = parameters?.ToDictionary(
x => x.Key.ToLowerInvariant(),
i => (i.Value is string) ? HttpUtility.HtmlDecode(i.Value.ToString()) : i.Value);
i => (i.Value is string) ? WebUtility.HtmlDecode(i.Value.ToString()) : i.Value);
var html = _macroRenderer.Render(alias, content, macroProps).Text;

8
src/Umbraco.Infrastructure/Media/EmbedProviders/Flickr.cs
View File

@@ -1,5 +1,5 @@
using System.Collections.Generic;
using System.Web;
using System.Net;
namespace Umbraco.Web.Media.EmbedProviders
{
@@ -14,7 +14,7 @@ namespace Umbraco.Web.Media.EmbedProviders
};
public override Dictionary<string, string> RequestParams => new Dictionary<string, string>();
public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0)
{
var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight);
@@ -25,7 +25,7 @@ namespace Umbraco.Web.Media.EmbedProviders
var imageHeight = GetXmlProperty(xmlDocument, "/oembed/height");
var imageTitle = GetXmlProperty(xmlDocument, "/oembed/title");
return string.Format("<img src=\"{0}\" width=\"{1}\" height=\"{2}\" alt=\"{3}\" />", imageUrl, imageWidth, imageHeight, HttpUtility.HtmlEncode(imageTitle));
}
return string.Format("<img src=\"{0}\" width=\"{1}\" height=\"{2}\" alt=\"{3}\" />", imageUrl, imageWidth, imageHeight, WebUtility.HtmlEncode(imageTitle));
}
}
}

5
src/Umbraco.Infrastructure/Media/EmbedProviders/OEmbedResponse.cs
View File

@@ -1,5 +1,4 @@
using System.Text;
using System.Web;
using System.Net;
using Newtonsoft.Json;
namespace Umbraco.Web.Media.EmbedProviders
@@ -52,7 +51,7 @@ namespace Umbraco.Web.Media.EmbedProviders
{
if (Type == "photo")
{
return "<img src=\"" + Url + "\" width=\"" + Width + "\" height=\"" + Height + "\" alt=\"" + HttpUtility.HtmlEncode(Title) + "\" />";
return "<img src=\"" + Url + "\" width=\"" + Width + "\" height=\"" + Height + "\" alt=\"" + WebUtility.HtmlEncode(Title) + "\" />";
}
return string.IsNullOrEmpty(Html) == false ? Html : string.Empty;

1
src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
View File

@@ -7,7 +7,6 @@ using System.Security.Cryptography;
using System.Threading;
using System.Threading.Tasks;
using Umbraco.Core.Configuration;
using System.Web;
using Umbraco.Core.Hosting;
using Umbraco.Core.Logging;
using Umbraco.Core.Persistence;

6
src/Umbraco.Web.BackOffice/Controllers/PackageController.cs
View File

@@ -4,7 +4,6 @@ using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Web;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Net.Http.Headers;
using Semver;
@@ -113,16 +112,15 @@ namespace Umbraco.Web.BackOffice.Controllers
var cd = new System.Net.Mime.ContentDisposition
{
FileName = HttpUtility.UrlEncode(fileName, encoding),
FileName = WebUtility.UrlEncode(fileName),
Inline = false // false = prompt the user for downloading; true = browser to try to show the file inline
};
Response.Headers.Add("Content-Disposition", cd.ToString());
// Set custom header so umbRequestHelper.downloadFile can save the correct filename
Response.Headers.Add("x-filename", HttpUtility.UrlEncode(fileName, encoding));
Response.Headers.Add("x-filename", WebUtility.UrlEncode(fileName));
return new FileStreamResult(System.IO.File.OpenRead(fullPath), new MediaTypeHeaderValue("application/octet-stream")
{
Charset = encoding.WebName,
});
}

10
src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.IO;
using System.Linq;
using System.Web;
using System.Net;
using Microsoft.AspNetCore.Http;
using Umbraco.Core;
using Umbraco.Core.IO;
@@ -48,7 +48,7 @@ namespace Umbraco.Web.BackOffice.Trees
protected override TreeNodeCollection GetTreeNodes(string id, FormCollection queryStrings)
{
var path = string.IsNullOrEmpty(id) == false && id != Constants.System.RootString
? HttpUtility.UrlDecode(id).TrimStart("/")
? WebUtility.UrlDecode(id).TrimStart("/")
: "";
var directories = FileSystem.GetDirectories(path);
@@ -59,7 +59,7 @@ namespace Umbraco.Web.BackOffice.Trees
var hasChildren = FileSystem.GetFiles(directory).Any() || FileSystem.GetDirectories(directory).Any();
var name = Path.GetFileName(directory);
var node = CreateTreeNode(HttpUtility.UrlEncode(directory), path, queryStrings, name, "icon-folder", hasChildren);
var node = CreateTreeNode(WebUtility.UrlEncode(directory), path, queryStrings, name, "icon-folder", hasChildren);
OnRenderFolderNode(ref node);
if (node != null)
nodes.Add(node);
@@ -83,7 +83,7 @@ namespace Umbraco.Web.BackOffice.Trees
if (withoutExt.IsNullOrWhiteSpace()) continue;
var name = Path.GetFileName(file);
var node = CreateTreeNode(HttpUtility.UrlEncode(file), path, queryStrings, name, FileIcon, false);
var node = CreateTreeNode(WebUtility.UrlEncode(file), path, queryStrings, name, FileIcon, false);
OnRenderFileNode(ref node);
if (node != null)
nodes.Add(node);
@@ -159,7 +159,7 @@ namespace Umbraco.Web.BackOffice.Trees
var menu = MenuItemCollectionFactory.Create();
var path = string.IsNullOrEmpty(id) == false && id != Constants.System.RootString
? HttpUtility.UrlDecode(id).TrimStart("/")
? WebUtility.UrlDecode(id).TrimStart("/")
: "";
var isFile = FileSystem.FileExists(path);

4
src/Umbraco.Web.BackOffice/Trees/UrlHelperExtensions.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Linq;
using System.Net;
using System.Text;
using System.Web;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Umbraco.Core;
@@ -32,7 +32,7 @@ namespace Umbraco.Extensions
for (var p = 0; p < pathPaths.Length; p++)
{
var path = HttpUtility.UrlEncode(string.Join("/", pathPaths.Take(p + 1)));
var path = WebUtility.UrlEncode(string.Join("/", pathPaths.Take(p + 1)));
if (string.IsNullOrEmpty(path) == false)
{
sb.Append(",");

52
src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoPageResult.cs
View File

@@ -1,8 +1,7 @@
using System;
using System.Collections.Specialized;
using System.Linq;
using System.Threading.Tasks;
using System.Web;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.Extensions.DependencyInjection;
@@ -20,7 +19,7 @@ namespace Umbraco.Web.Website.ActionResults
{
private IPublishedContent _publishedContent;
private readonly int _pageId;
private readonly NameValueCollection _queryStringValues;
private readonly QueryString _queryString;
private readonly IPublishedUrlProvider _publishedUrlProvider;
private readonly IUmbracoContextAccessor _umbracoContextAccessor;
private string _url;
@@ -79,24 +78,10 @@ namespace Umbraco.Web.Website.ActionResults
/// <param name="pageId"></param>
/// <param name="queryStringValues"></param>
/// <param name="publishedUrlProvider"></param>
public RedirectToUmbracoPageResult(int pageId, NameValueCollection queryStringValues, IPublishedUrlProvider publishedUrlProvider, IUmbracoContextAccessor umbracoContextAccessor)
public RedirectToUmbracoPageResult(int pageId, QueryString queryString, IPublishedUrlProvider publishedUrlProvider, IUmbracoContextAccessor umbracoContextAccessor)
{
_pageId = pageId;
_queryStringValues = queryStringValues;
_publishedUrlProvider = publishedUrlProvider;
_umbracoContextAccessor = umbracoContextAccessor;
}
/// <summary>
/// Creates a new RedirectToUmbracoResult
/// </summary>
/// <param name="pageId"></param>
/// <param name="queryString"></param>
/// <param name="publishedUrlProvider"></param>
public RedirectToUmbracoPageResult(int pageId, string queryString, IPublishedUrlProvider publishedUrlProvider, IUmbracoContextAccessor umbracoContextAccessor)
{
_pageId = pageId;
_queryStringValues = ParseQueryString(queryString);
_queryString = queryString;
_publishedUrlProvider = publishedUrlProvider;
_umbracoContextAccessor = umbracoContextAccessor;
}
@@ -115,22 +100,6 @@ namespace Umbraco.Web.Website.ActionResults
_umbracoContextAccessor = umbracoContextAccessor;
}
/// <summary>
/// Creates a new RedirectToUmbracoResult
/// </summary>
/// <param name="publishedContent"></param>
/// <param name="queryStringValues"></param>
/// <param name="publishedUrlProvider"></param>
/// <param name="umbracoContextAccessor"></param>
public RedirectToUmbracoPageResult(IPublishedContent publishedContent, NameValueCollection queryStringValues, IPublishedUrlProvider publishedUrlProvider, IUmbracoContextAccessor umbracoContextAccessor)
{
_publishedContent = publishedContent;
_pageId = publishedContent.Id;
_queryStringValues = queryStringValues;
_publishedUrlProvider = publishedUrlProvider;
_umbracoContextAccessor = umbracoContextAccessor;
}
/// <summary>
/// Creates a new RedirectToUmbracoResult
/// </summary>
@@ -138,11 +107,11 @@ namespace Umbraco.Web.Website.ActionResults
/// <param name="queryString"></param>
/// <param name="publishedUrlProvider"></param>
/// <param name="umbracoContextAccessor"></param>
public RedirectToUmbracoPageResult(IPublishedContent publishedContent, string queryString, IPublishedUrlProvider publishedUrlProvider, IUmbracoContextAccessor umbracoContextAccessor)
public RedirectToUmbracoPageResult(IPublishedContent publishedContent, QueryString queryString, IPublishedUrlProvider publishedUrlProvider, IUmbracoContextAccessor umbracoContextAccessor)
{
_publishedContent = publishedContent;
_pageId = publishedContent.Id;
_queryStringValues = ParseQueryString(queryString);
_queryString = queryString;
_publishedUrlProvider = publishedUrlProvider;
_umbracoContextAccessor = umbracoContextAccessor;
}
@@ -155,10 +124,9 @@ namespace Umbraco.Web.Website.ActionResults
var ioHelper = httpContext.RequestServices.GetRequiredService<IIOHelper>();
var destinationUrl = ioHelper.ResolveUrl(Url);
if (!(_queryStringValues is null) && _queryStringValues.Count > 0)
if (_queryString.HasValue)
{
destinationUrl += "?" + string.Join("&",
_queryStringValues.AllKeys.Select(x => x + "=" + HttpUtility.UrlEncode(_queryStringValues[x])));
destinationUrl += _queryString.ToUriComponent();
}
var tempDataDictionaryFactory = context.HttpContext.RequestServices.GetRequiredService<ITempDataDictionaryFactory>();
@@ -170,9 +138,5 @@ namespace Umbraco.Web.Website.ActionResults
return Task.CompletedTask;
}
private NameValueCollection ParseQueryString(string queryString)
{
return !string.IsNullOrEmpty(queryString) ? HttpUtility.ParseQueryString(queryString) : null;
}
}
}

39
src/Umbraco.Web.Website/Controllers/SurfaceController.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Specialized;
using Microsoft.AspNetCore.Http;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Logging;
@@ -54,24 +55,13 @@ namespace Umbraco.Web.Website.Controllers
return new RedirectToUmbracoPageResult(pageId, _publishedUrlProvider, UmbracoContextAccessor);
}
/// <summary>
/// Redirects to the Umbraco page with the given id and passes provided querystring
/// </summary>
/// <param name="pageId"></param>
/// <param name="queryStringValues"></param>
/// <returns></returns>
protected RedirectToUmbracoPageResult RedirectToUmbracoPage(int pageId, NameValueCollection queryStringValues)
{
return new RedirectToUmbracoPageResult(pageId, queryStringValues, _publishedUrlProvider, UmbracoContextAccessor);
}
/// <summary>
/// Redirects to the Umbraco page with the given id and passes provided querystring
/// </summary>
/// <param name="pageId"></param>
/// <param name="queryString"></param>
/// <returns></returns>
protected RedirectToUmbracoPageResult RedirectToUmbracoPage(int pageId, string queryString)
protected RedirectToUmbracoPageResult RedirectToUmbracoPage(int pageId, QueryString queryString)
{
return new RedirectToUmbracoPageResult(pageId, queryString, _publishedUrlProvider, UmbracoContextAccessor);
}
@@ -86,24 +76,13 @@ namespace Umbraco.Web.Website.Controllers
return new RedirectToUmbracoPageResult(publishedContent, _publishedUrlProvider, UmbracoContextAccessor);
}
/// <summary>
/// Redirects to the Umbraco page with the given published content and passes provided querystring
/// </summary>
/// <param name="publishedContent"></param>
/// <param name="queryStringValues"></param>
/// <returns></returns>
protected RedirectToUmbracoPageResult RedirectToUmbracoPage(IPublishedContent publishedContent, NameValueCollection queryStringValues)
{
return new RedirectToUmbracoPageResult(publishedContent, queryStringValues, _publishedUrlProvider, UmbracoContextAccessor);
}
/// <summary>
/// Redirects to the Umbraco page with the given published content and passes provided querystring
/// </summary>
/// <param name="publishedContent"></param>
/// <param name="queryString"></param>
/// <returns></returns>
protected RedirectToUmbracoPageResult RedirectToUmbracoPage(IPublishedContent publishedContent, string queryString)
protected RedirectToUmbracoPageResult RedirectToUmbracoPage(IPublishedContent publishedContent, QueryString queryString)
{
return new RedirectToUmbracoPageResult(publishedContent, queryString, _publishedUrlProvider, UmbracoContextAccessor);
}
@@ -117,22 +96,12 @@ namespace Umbraco.Web.Website.Controllers
return new RedirectToUmbracoPageResult(CurrentPage, _publishedUrlProvider, UmbracoContextAccessor);
}
/// <summary>
/// Redirects to the currently rendered Umbraco page and passes provided querystring
/// </summary>
/// <param name="queryStringValues"></param>
/// <returns></returns>
protected RedirectToUmbracoPageResult RedirectToCurrentUmbracoPage(NameValueCollection queryStringValues)
{
return new RedirectToUmbracoPageResult(CurrentPage, queryStringValues, _publishedUrlProvider, UmbracoContextAccessor);
}
/// <summary>
/// Redirects to the currently rendered Umbraco page and passes provided querystring
/// </summary>
/// <param name="queryString"></param>
/// <returns></returns>
protected RedirectToUmbracoPageResult RedirectToCurrentUmbracoPage(string queryString)
protected RedirectToUmbracoPageResult RedirectToCurrentUmbracoPage(QueryString queryString)
{
return new RedirectToUmbracoPageResult(CurrentPage, queryString, _publishedUrlProvider, UmbracoContextAccessor);
}