removed now obsolete .NET 4.0 polyfill

ThisWillDoIt · ThisWillDoIt · commit b0d0613b8250 · 2016-09-26T22:08:21.000+02:00
diff --git a/BlogEngine/BlogEngine.Core/Data/RolesRepository.cs b/BlogEngine/BlogEngine.Core/Data/RolesRepository.cs
@@ -67,7 +67,7 @@ public RoleItem Add(Data.Models.RoleItem role)
             {
                 throw new System.UnauthorizedAccessException();
             }
-            else if (Utils.StringIsNullOrWhitespace(role.RoleName))
+            else if (String.IsNullOrWhiteSpace(role.RoleName))
             {
                 throw new ApplicationException("Role name is required");
             }
@@ -121,7 +121,7 @@ public bool Remove(string id)
             if (!Security.IsAuthorizedTo(Rights.DeleteRoles))
                 throw new System.UnauthorizedAccessException();
 
-            if (Utils.StringIsNullOrWhitespace(id))
+            if (String.IsNullOrWhiteSpace(id))
                 throw new ApplicationException("Role name is required");
 
             try
@@ -234,7 +234,7 @@ public bool SaveRights(List<Data.Models.Group> rights, string id)
             {
                 throw new System.UnauthorizedAccessException();
             }
-            else if (Utils.StringIsNullOrWhitespace(id))
+            else if (String.IsNullOrWhiteSpace(id))
             {
                 throw new ApplicationException("Invalid role name");
             }
diff --git a/BlogEngine/BlogEngine.Core/Data/UsersRepository.cs b/BlogEngine/BlogEngine.Core/Data/UsersRepository.cs
@@ -226,7 +226,7 @@ public bool Remove(string id){
 
         static Profile GetProfile(string id)
         {
-            if (!Utils.StringIsNullOrWhitespace(id))
+            if (!String.IsNullOrWhiteSpace(id))
             {
                 var pf = AuthorProfile.GetProfile(id);
                 if (pf == null)
diff --git a/BlogEngine/BlogEngine.Core/Helpers/Utils.cs b/BlogEngine/BlogEngine.Core/Helpers/Utils.cs
@@ -675,7 +675,7 @@ public static Dictionary<Uri, XmlDocument> FindSemanticDocuments(Uri url, string
         public static CultureInfo GetDefaultCulture()
         {
             var settingsCulture = BlogSettings.Instance.Culture;
-            if (Utils.StringIsNullOrWhitespace(settingsCulture) ||
+            if (String.IsNullOrWhiteSpace(settingsCulture) ||
                 settingsCulture.Equals("Auto", StringComparison.OrdinalIgnoreCase))
             {
                 return CultureInfo.InstalledUICulture;
@@ -1232,16 +1232,6 @@ public static bool SetConditionalGetHeaders(DateTime date)
             return false;
         }
 
-        /// <summary>
-        /// Returns whether a string is null, empty, or whitespace. Same implementation as in String.IsNullOrWhitespace in .Net 4.0
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static bool StringIsNullOrWhitespace(string value)
-        {
-            return ((value == null) || (value.Trim().Length == 0));
-        }
-
         /// <summary>
         /// Strips all HTML tags from the specified string.
         /// </summary>
@@ -1253,7 +1243,7 @@ public static bool StringIsNullOrWhitespace(string value)
         /// </returns>
         public static string StripHtml(string html)
         {
-            return Utils.StringIsNullOrWhitespace(html) ? string.Empty : RegexStripHtml.Replace(html, string.Empty).Trim();
+            return String.IsNullOrWhiteSpace(html) ? string.Empty : RegexStripHtml.Replace(html, string.Empty).Trim();
         }
 
         /// <summary>
diff --git a/BlogEngine/BlogEngine.Core/Providers/XmlProvider/XmlRoleProvider.cs b/BlogEngine/BlogEngine.Core/Providers/XmlProvider/XmlRoleProvider.cs
@@ -412,7 +412,7 @@ public override void RemoveUsersFromRoles(string[] usernames, string[] roleNames
         /// </param>
         public override bool RoleExists(string roleName)
         {
-            if (Utils.StringIsNullOrWhitespace(roleName))
+            if (String.IsNullOrWhiteSpace(roleName))
             {
                 throw new ArgumentNullException("roleName");
             }
diff --git a/BlogEngine/BlogEngine.Core/Services/Security/CustomIdentity.cs b/BlogEngine/BlogEngine.Core/Services/Security/CustomIdentity.cs
@@ -64,10 +64,10 @@ public CustomIdentity(string username, bool isAuthenticated)
         /// <param name="password">The user's password.</param>
         public CustomIdentity(string username, string password)
         {
-            if (Utils.StringIsNullOrWhitespace(username))
+            if (String.IsNullOrWhiteSpace(username))
                 throw new ArgumentNullException("username");
 
-            if (Utils.StringIsNullOrWhitespace(password))
+            if (String.IsNullOrWhiteSpace(password))
                 throw new ArgumentNullException("password");
 
             if (!Membership.ValidateUser(username, password)) { return; }
diff --git a/BlogEngine/BlogEngine.Core/Services/Security/Right.cs b/BlogEngine/BlogEngine.Core/Services/Security/Right.cs
@@ -347,7 +347,7 @@ public static void OnRoleDeleting(string roleName)
         /// <returns></returns>
         private static string PrepareRoleName(string roleName)
         {
-            if (Utils.StringIsNullOrWhitespace(roleName))
+            if (String.IsNullOrWhiteSpace(roleName))
             {
                 throw new ArgumentNullException("roleName");
             }
@@ -373,7 +373,7 @@ public static IEnumerable<Right> GetAllRights()
         /// <returns></returns>
         public static Right GetRightByName(string rightName)
         {
-            if (Utils.StringIsNullOrWhitespace(rightName))
+            if (String.IsNullOrWhiteSpace(rightName))
             {
                 throw new ArgumentNullException("rightName");
             }
diff --git a/BlogEngine/BlogEngine.Core/Services/Security/SecuritySiteMapProvider.cs b/BlogEngine/BlogEngine.Core/Services/Security/SecuritySiteMapProvider.cs
@@ -33,14 +33,14 @@ public override bool IsAccessibleToUser(HttpContext context, SiteMapNode node)
                 }
             }
 
-            if (!Utils.StringIsNullOrWhitespace(node["rights"]))
+            if (!String.IsNullOrWhiteSpace(node["rights"]))
             {
                 // By default, all specified Rights must exist.
                 // We allow this to be overridden via the "rightsAuthorizationCheck"
                 // attribute.
 
                 AuthorizationCheck authCheck = AuthorizationCheck.HasAll;
-                if (!Utils.StringIsNullOrWhitespace(node["rightsAuthorizationCheck"]))
+                if (!String.IsNullOrWhiteSpace(node["rightsAuthorizationCheck"]))
                 {
                     authCheck = Utils.ParseEnum<AuthorizationCheck>(node["rightsAuthorizationCheck"], AuthorizationCheck.HasAll);
                 }
diff --git a/BlogEngine/BlogEngine.Core/Services/Syndication/BlogML/BlogReader.cs b/BlogEngine/BlogEngine.Core/Services/Syndication/BlogML/BlogReader.cs
@@ -121,7 +121,7 @@ private Guid GetGuid(string type, string value)
 
             // Value might be a GUID, or it could be a simple integer.
 
-            if (!Utils.StringIsNullOrWhitespace(value) &&
+            if (!String.IsNullOrWhiteSpace(value) &&
                 value.Length == 36)
             {
                 return new Guid(value);
@@ -160,7 +160,7 @@ private DateTime GetDate(XmlAttribute attr)
             DateTime defaultDate = DateTime.Now;
 
             DateTime dt = defaultDate;
-            if (!Utils.StringIsNullOrWhitespace(value))
+            if (!String.IsNullOrWhiteSpace(value))
             {
                 if (!DateTime.TryParseExact(value, "yyyy-MM-ddTHH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.None, out dt))
                     dt = defaultDate;
diff --git a/BlogEngine/BlogEngine.NET/Custom/Extensions/SendCommentMail.cs b/BlogEngine/BlogEngine.NET/Custom/Extensions/SendCommentMail.cs
@@ -58,7 +58,7 @@ private static void PostCommentAdded(object sender, EventArgs e)
         // If moderation is on, send the email if the comment hasn't been moderated (so
         // the blog owner can determine if the comment should be approved/rejected).
         if (BlogSettings.Instance.EnableCommentsModeration &&
-            !Utils.StringIsNullOrWhitespace(comment.ModeratedBy))
+            !String.IsNullOrWhiteSpace(comment.ModeratedBy))
         {
             return;
         }
diff --git a/BlogEngine/BlogEngine.NET/Custom/Widgets/Newsletter/Newsletter.cs b/BlogEngine/BlogEngine.NET/Custom/Widgets/Newsletter/Newsletter.cs
@@ -77,7 +77,7 @@ public static void SendEmails(IPublishable publishable)
             {
                 foreach (var email in emails)
                 {
-                    if (!Utils.StringIsNullOrWhitespace(email) && Utils.IsEmailValid(email))
+                    if (!String.IsNullOrWhiteSpace(email) && Utils.IsEmailValid(email))
                     {
                         MailMessage message = CreateEmail(publishable);
                         message.To.Add(email);
diff --git a/BlogEngine/BlogEngine.NET/post.aspx.cs b/BlogEngine/BlogEngine.NET/post.aspx.cs
@@ -22,7 +22,7 @@ protected override void OnInit(EventArgs e)
         var requestId = Request.QueryString["id"];
         Guid id;
 
-        if ((!Utils.StringIsNullOrWhitespace(requestId)) && requestId.TryParse(out id))
+        if ((!String.IsNullOrWhiteSpace(requestId)) && requestId.TryParse(out id))
         {
 
             Post post = Post.ApplicablePosts.Find(p => p.Id == id);
diff --git a/BlogEngine/BlogEngine.NET/search.aspx.cs b/BlogEngine/BlogEngine.NET/search.aspx.cs
@@ -27,7 +27,7 @@ protected override void OnLoad(EventArgs e)
         rep.ItemDataBound += new RepeaterItemEventHandler(rep_ItemDataBound);
 
         var term = Request.QueryString["q"];
-        if (!Utils.StringIsNullOrWhitespace(term))
+        if (!String.IsNullOrWhiteSpace(term))
         {
             bool includeComments = (Request.QueryString["comment"] == "true");
 
@@ -150,7 +150,7 @@ private void BindSearchResult(List<IPublishable> list)
 		int page = 1;
 
         string queryStringPage = Request.QueryString["page"];
-        if (!Utils.StringIsNullOrWhitespace(queryStringPage))
+        if (!String.IsNullOrWhiteSpace(queryStringPage))
 		{
             int.TryParse(queryStringPage, out page);
 

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public RoleItem Add(Data.Models.RoleItem role)`
`67`	`67`	`{`
`68`	`68`	`throw new System.UnauthorizedAccessException();`
`69`	`69`	`}`
`70`		`- else if (Utils.StringIsNullOrWhitespace(role.RoleName))`
	`70`	`+ else if (String.IsNullOrWhiteSpace(role.RoleName))`
`71`	`71`	`{`
`72`	`72`	`throw new ApplicationException("Role name is required");`
`73`	`73`	`}`
`@@ -121,7 +121,7 @@ public bool Remove(string id)`
`121`	`121`	`if (!Security.IsAuthorizedTo(Rights.DeleteRoles))`
`122`	`122`	`throw new System.UnauthorizedAccessException();`
`123`	`123`
`124`		`- if (Utils.StringIsNullOrWhitespace(id))`
	`124`	`+ if (String.IsNullOrWhiteSpace(id))`
`125`	`125`	`throw new ApplicationException("Role name is required");`
`126`	`126`
`127`	`127`	`try`
`@@ -234,7 +234,7 @@ public bool SaveRights(List<Data.Models.Group> rights, string id)`
`234`	`234`	`{`
`235`	`235`	`throw new System.UnauthorizedAccessException();`
`236`	`236`	`}`
`237`		`- else if (Utils.StringIsNullOrWhitespace(id))`
	`237`	`+ else if (String.IsNullOrWhiteSpace(id))`
`238`	`238`	`{`
`239`	`239`	`throw new ApplicationException("Invalid role name");`
`240`	`240`	`}`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ public bool Remove(string id){`
`226`	`226`
`227`	`227`	`static Profile GetProfile(string id)`
`228`	`228`	`{`
`229`		`- if (!Utils.StringIsNullOrWhitespace(id))`
	`229`	`+ if (!String.IsNullOrWhiteSpace(id))`
`230`	`230`	`{`
`231`	`231`	`var pf = AuthorProfile.GetProfile(id);`
`232`	`232`	`if (pf == null)`
Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ public override void RemoveUsersFromRoles(string[] usernames, string[] roleNames`
`412`	`412`	`/// </param>`
`413`	`413`	`public override bool RoleExists(string roleName)`
`414`	`414`	`{`
`415`		`- if (Utils.StringIsNullOrWhitespace(roleName))`
	`415`	`+ if (String.IsNullOrWhiteSpace(roleName))`
`416`	`416`	`{`
`417`	`417`	`throw new ArgumentNullException("roleName");`
`418`	`418`	`}`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ public static void OnRoleDeleting(string roleName)`
`347`	`347`	`/// <returns></returns>`
`348`	`348`	`private static string PrepareRoleName(string roleName)`
`349`	`349`	`{`
`350`		`- if (Utils.StringIsNullOrWhitespace(roleName))`
	`350`	`+ if (String.IsNullOrWhiteSpace(roleName))`
`351`	`351`	`{`
`352`	`352`	`throw new ArgumentNullException("roleName");`
`353`	`353`	`}`
`@@ -373,7 +373,7 @@ public static IEnumerable<Right> GetAllRights()`
`373`	`373`	`/// <returns></returns>`
`374`	`374`	`public static Right GetRightByName(string rightName)`
`375`	`375`	`{`
`376`		`- if (Utils.StringIsNullOrWhitespace(rightName))`
	`376`	`+ if (String.IsNullOrWhiteSpace(rightName))`
`377`	`377`	`{`
`378`	`378`	`throw new ArgumentNullException("rightName");`
`379`	`379`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,14 @@ public override bool IsAccessibleToUser(HttpContext context, SiteMapNode node)`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- if (!Utils.StringIsNullOrWhitespace(node["rights"]))`
	`36`	`+ if (!String.IsNullOrWhiteSpace(node["rights"]))`
`37`	`37`	`{`
`38`	`38`	`// By default, all specified Rights must exist.`
`39`	`39`	`// We allow this to be overridden via the "rightsAuthorizationCheck"`
`40`	`40`	`// attribute.`
`41`	`41`
`42`	`42`	`AuthorizationCheck authCheck = AuthorizationCheck.HasAll;`
`43`		`- if (!Utils.StringIsNullOrWhitespace(node["rightsAuthorizationCheck"]))`
	`43`	`+ if (!String.IsNullOrWhiteSpace(node["rightsAuthorizationCheck"]))`
`44`	`44`	`{`
`45`	`45`	`authCheck = Utils.ParseEnum<AuthorizationCheck>(node["rightsAuthorizationCheck"], AuthorizationCheck.HasAll);`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ private Guid GetGuid(string type, string value)`
`121`	`121`
`122`	`122`	`// Value might be a GUID, or it could be a simple integer.`
`123`	`123`
`124`		`- if (!Utils.StringIsNullOrWhitespace(value) &&`
	`124`	`+ if (!String.IsNullOrWhiteSpace(value) &&`
`125`	`125`	`value.Length == 36)`
`126`	`126`	`{`
`127`	`127`	`return new Guid(value);`
`@@ -160,7 +160,7 @@ private DateTime GetDate(XmlAttribute attr)`
`160`	`160`	`DateTime defaultDate = DateTime.Now;`
`161`	`161`
`162`	`162`	`DateTime dt = defaultDate;`
`163`		`- if (!Utils.StringIsNullOrWhitespace(value))`
	`163`	`+ if (!String.IsNullOrWhiteSpace(value))`
`164`	`164`	`{`
`165`	`165`	`if (!DateTime.TryParseExact(value, "yyyy-MM-ddTHH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.None, out dt))`
`166`	`166`	`dt = defaultDate;`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ private static void PostCommentAdded(object sender, EventArgs e)`
`58`	`58`	`// If moderation is on, send the email if the comment hasn't been moderated (so`
`59`	`59`	`// the blog owner can determine if the comment should be approved/rejected).`
`60`	`60`	`if (BlogSettings.Instance.EnableCommentsModeration &&`
`61`		`- !Utils.StringIsNullOrWhitespace(comment.ModeratedBy))`
	`61`	`+ !String.IsNullOrWhiteSpace(comment.ModeratedBy))`
`62`	`62`	`{`
`63`	`63`	`return;`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public static void SendEmails(IPublishable publishable)`
`77`	`77`	`{`
`78`	`78`	`foreach (var email in emails)`
`79`	`79`	`{`
`80`		`- if (!Utils.StringIsNullOrWhitespace(email) && Utils.IsEmailValid(email))`
	`80`	`+ if (!String.IsNullOrWhiteSpace(email) && Utils.IsEmailValid(email))`
`81`	`81`	`{`
`82`	`82`	`MailMessage message = CreateEmail(publishable);`
`83`	`83`	`message.To.Add(email);`