From b9b7cb6d850de634658c5c3394033e04746daf39 Mon Sep 17 00:00:00 2001
From: Zeegaan <skrivdetud@gmail.com>
Date: Wed, 13 Nov 2024 09:27:29 +0100
Subject: [PATCH] Rename extension methods back

---
 .../OpenApi/SchemaIdHandler.cs                       |  2 +-
 .../Services/ApiMediaQueryService.cs                 |  2 +-
 .../Services/RequestRedirectService.cs               |  2 +-
 .../Controllers/Indexer/AllIndexerController.cs      |  2 +-
 .../Controllers/Searcher/AllSearcherController.cs    |  2 +-
 .../umbraco/UmbracoWebsite/Maintenance.cshtml        |  2 +-
 .../umbraco/UmbracoWebsite/NoNodes.cshtml            |  2 +-
 .../umbraco/UmbracoWebsite/NotFound.cshtml           |  2 +-
 .../Configuration/ModelsBuilderConfigExtensions.cs   |  2 +-
 .../DeliveryApi/ApiContentRouteBuilder.cs            |  2 +-
 src/Umbraco.Core/Extensions/StringExtensions.cs      | 10 +++++-----
 src/Umbraco.Core/Models/Content.cs                   | 12 ++++++------
 src/Umbraco.Core/Models/ContentBase.cs               | 12 ++++++------
 src/Umbraco.Core/Routing/UmbracoRequestPaths.cs      |  4 ++--
 .../BackOfficeExamineSearcher.cs                     |  2 +-
 src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs |  2 +-
 .../DeliveryApi/ApiRichTextElementParser.cs          |  2 +-
 .../Install/FilePermissionHelper.cs                  |  4 ++--
 .../Logging/Serilog/LoggerConfigExtensions.cs        |  2 +-
 .../Persistence/NPocoSqlExtensions.cs                |  4 ++--
 .../Repositories/Implement/UserRepository.cs         |  2 +-
 .../Persistence/SqlSyntax/SqlSyntaxProviderBase.cs   |  2 +-
 .../Extensions/ApplicationBuilderExtensions.cs       |  2 +-
 .../Extensions/LinkGeneratorExtensions.cs            |  2 +-
 .../Extensions/UrlHelperExtensions.cs                |  4 ++--
 .../DependencyInjection/UmbracoBuilderExtensions.cs  |  2 +-
 .../ManagementApi/ManagementApiTest.cs               |  2 +-
 .../ExamineExternalIndexSearcherTest.cs              |  2 +-
 .../ShortStringHelper/StringExtensionsTests.cs       |  4 ++--
 .../Persistence/NPocoTests/NPocoSqlTemplateTests.cs  |  2 +-
 30 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/Umbraco.Cms.Api.Common/OpenApi/SchemaIdHandler.cs b/src/Umbraco.Cms.Api.Common/OpenApi/SchemaIdHandler.cs
index 6e96cbed42..c08e0be19a 100644
--- a/src/Umbraco.Cms.Api.Common/OpenApi/SchemaIdHandler.cs
+++ b/src/Umbraco.Cms.Api.Common/OpenApi/SchemaIdHandler.cs
@@ -36,7 +36,7 @@ public class SchemaIdHandler : ISchemaIdHandler
         // first grab the "non-generic" part of any generic type name (i.e. "PagedViewModel`1" becomes "PagedViewModel")
         .Split('`').First()
         // then remove the "ViewModel" postfix from type names
-        .TrimEndExact("ViewModel");
+        .TrimEnd("ViewModel");
 
     private string HandleGenerics(string name, Type type)
     {
diff --git a/src/Umbraco.Cms.Api.Delivery/Services/ApiMediaQueryService.cs b/src/Umbraco.Cms.Api.Delivery/Services/ApiMediaQueryService.cs
index 7979895ba3..9dcf85b6ef 100644
--- a/src/Umbraco.Cms.Api.Delivery/Services/ApiMediaQueryService.cs
+++ b/src/Umbraco.Cms.Api.Delivery/Services/ApiMediaQueryService.cs
@@ -87,7 +87,7 @@ internal sealed class ApiMediaQueryService : IApiMediaQueryService
             return null;
         }
 
-        var childrenOf = fetch.TrimStartExact(childrenOfParameter);
+        var childrenOf = fetch.TrimStart(childrenOfParameter);
         if (childrenOf.IsNullOrWhiteSpace())
         {
             // this mirrors the current behavior of the Content Delivery API :-)
diff --git a/src/Umbraco.Cms.Api.Delivery/Services/RequestRedirectService.cs b/src/Umbraco.Cms.Api.Delivery/Services/RequestRedirectService.cs
index 2f74d86364..6189e7154e 100644
--- a/src/Umbraco.Cms.Api.Delivery/Services/RequestRedirectService.cs
+++ b/src/Umbraco.Cms.Api.Delivery/Services/RequestRedirectService.cs
@@ -66,7 +66,7 @@ internal sealed class RequestRedirectService : RoutingServiceBase, IRequestRedir
         }
 
         // important: redirect URLs are always tracked without trailing slashes
-        IRedirectUrl? redirectUrl = _redirectUrlService.GetMostRecentRedirectUrl(requestedPath.TrimEndExact("/"), culture);
+        IRedirectUrl? redirectUrl = _redirectUrlService.GetMostRecentRedirectUrl(requestedPath.TrimEnd("/"), culture);
         IPublishedContent? content = redirectUrl != null
             ? _apiPublishedContentCache.GetById(redirectUrl.ContentKey)
             : null;
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Indexer/AllIndexerController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Indexer/AllIndexerController.cs
index 6ce4d3b12b..768389b56d 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Indexer/AllIndexerController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Indexer/AllIndexerController.cs
@@ -37,7 +37,7 @@ public class AllIndexerController : IndexerControllerBase
     {
         IndexResponseModel[] indexes = _examineManager.Indexes
             .Select(_indexPresentationFactory.Create)
-            .OrderBy(indexModel => indexModel.Name.TrimEndExact("Indexer")).ToArray();
+            .OrderBy(indexModel => indexModel.Name.TrimEnd("Indexer")).ToArray();
 
         var viewModel = new PagedViewModel<IndexResponseModel> { Items = indexes.Skip(skip).Take(take), Total = indexes.Length };
         return Task.FromResult(viewModel);
diff --git a/src/Umbraco.Cms.Api.Management/Controllers/Searcher/AllSearcherController.cs b/src/Umbraco.Cms.Api.Management/Controllers/Searcher/AllSearcherController.cs
index 4c5189dcaa..76cd2f639b 100644
--- a/src/Umbraco.Cms.Api.Management/Controllers/Searcher/AllSearcherController.cs
+++ b/src/Umbraco.Cms.Api.Management/Controllers/Searcher/AllSearcherController.cs
@@ -30,7 +30,7 @@ public class AllSearcherController : SearcherControllerBase
         var searchers = new List<SearcherResponse>(
             _examineManager.RegisteredSearchers.Select(searcher => new SearcherResponse { Name = searcher.Name })
                 .OrderBy(x =>
-                    x.Name.TrimEndExact("Searcher"))); // order by name , but strip the "Searcher" from the end if it exists
+                    x.Name.TrimEnd("Searcher"))); // order by name , but strip the "Searcher" from the end if it exists
         var viewModel = new PagedViewModel<SearcherResponse>
         {
             Items = searchers.Skip(skip).Take(take),
diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/Maintenance.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/Maintenance.cshtml
index 5c41abf6fa..94de5f3c52 100644
--- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/Maintenance.cshtml
+++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/Maintenance.cshtml
@@ -17,7 +17,7 @@
 
     <title>Website is Under Maintainance</title>
 
-    <link rel="stylesheet" href="@WebPath.Combine(backOfficePath.TrimStartExact("~") , "website", "/nonodes.css")" />
+    <link rel="stylesheet" href="@WebPath.Combine(backOfficePath.TrimStart("~") , "website", "/nonodes.css")" />
     <style type="text/css">
         body {
             color:initial;
diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/NoNodes.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/NoNodes.cshtml
index c696c1c01e..622cce9f0c 100644
--- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/NoNodes.cshtml
+++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/NoNodes.cshtml
@@ -18,7 +18,7 @@
 
     <title>Umbraco: No Published Content</title>
 
-    <link rel="stylesheet" href="@WebPath.Combine(backOfficePath.TrimStartExact("~") , "website", "/nonodes.css")" />
+    <link rel="stylesheet" href="@WebPath.Combine(backOfficePath.TrimStart("~") , "website", "/nonodes.css")" />
 </head>
 <body>
 
diff --git a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/NotFound.cshtml b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/NotFound.cshtml
index 11b136dec4..38a9d559fd 100644
--- a/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/NotFound.cshtml
+++ b/src/Umbraco.Cms.StaticAssets/umbraco/UmbracoWebsite/NotFound.cshtml
@@ -17,7 +17,7 @@
 
     <title>Page Not Found</title>
 
-    <link rel="stylesheet" href="@WebPath.Combine(backOfficePath.TrimStartExact("~") , "website", "/nonodes.css")" />
+    <link rel="stylesheet" href="@WebPath.Combine(backOfficePath.TrimStart("~") , "website", "/nonodes.css")" />
     <style type="text/css">
         body {
             color:initial;
diff --git a/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs b/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
index 0ade116444..2cbfb547e1 100644
--- a/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
+++ b/src/Umbraco.Core/Configuration/ModelsBuilderConfigExtensions.cs
@@ -53,7 +53,7 @@ public static class ModelsBuilderConfigExtensions
 
         if (config.StartsWith("~/"))
         {
-            var dir = Path.Combine(root, config.TrimStartExact("~/"));
+            var dir = Path.Combine(root, config.TrimStart("~/"));
 
             // sanitize - GetFullPath will take care of any relative
             // segments in path, eg '../../foo.tmp' - it may throw a SecurityException
diff --git a/src/Umbraco.Core/DeliveryApi/ApiContentRouteBuilder.cs b/src/Umbraco.Core/DeliveryApi/ApiContentRouteBuilder.cs
index 45bb26cb0c..306cf7f3ee 100644
--- a/src/Umbraco.Core/DeliveryApi/ApiContentRouteBuilder.cs
+++ b/src/Umbraco.Core/DeliveryApi/ApiContentRouteBuilder.cs
@@ -59,7 +59,7 @@ public sealed class ApiContentRouteBuilder : IApiContentRouteBuilder
 
         if (_globalSettings.HideTopLevelNodeFromPath == false)
         {
-            contentPath = contentPath.TrimStartExact(rootPath.EnsureStartsWith("/")).EnsureStartsWith("/");
+            contentPath = contentPath.TrimStart(rootPath.EnsureStartsWith("/")).EnsureStartsWith("/");
         }
 
         return new ApiContentRoute(contentPath, new ApiContentStartItem(root.Key, rootPath));
diff --git a/src/Umbraco.Core/Extensions/StringExtensions.cs b/src/Umbraco.Core/Extensions/StringExtensions.cs
index be31bbb922..732e25ecc2 100644
--- a/src/Umbraco.Core/Extensions/StringExtensions.cs
+++ b/src/Umbraco.Core/Extensions/StringExtensions.cs
@@ -287,14 +287,14 @@ public static class StringExtensions
     /// <param name="value">The value.</param>
     /// <param name="forRemoving">For removing.</param>
     /// <returns></returns>
-    public static string TrimExact(this string value, string forRemoving)
+    public static string Trim(this string value, string forRemoving)
     {
         if (string.IsNullOrEmpty(value))
         {
             return value;
         }
 
-        return value.TrimEndExact(forRemoving).TrimStartExact(forRemoving);
+        return value.TrimEnd(forRemoving).TrimStart(forRemoving);
     }
 
     public static string EncodeJsString(this string s)
@@ -343,7 +343,7 @@ public static class StringExtensions
         return sb.ToString();
     }
 
-    public static string TrimEndExact(this string value, string forRemoving)
+    public static string TrimEnd(this string value, string forRemoving)
     {
         if (string.IsNullOrEmpty(value))
         {
@@ -363,7 +363,7 @@ public static class StringExtensions
         return value;
     }
 
-    public static string TrimStartExact(this string value, string forRemoving)
+    public static string TrimStart(this string value, string forRemoving)
     {
         if (string.IsNullOrEmpty(value))
         {
@@ -390,7 +390,7 @@ public static class StringExtensions
             return input;
         }
 
-        return toStartWith + input.TrimStartExact(toStartWith);
+        return toStartWith + input.TrimStart(toStartWith);
     }
 
     public static string EnsureStartsWith(this string input, char value) =>
diff --git a/src/Umbraco.Core/Models/Content.cs b/src/Umbraco.Core/Models/Content.cs
index 5f3e76c0d4..ce8f769cad 100644
--- a/src/Umbraco.Core/Models/Content.cs
+++ b/src/Umbraco.Core/Models/Content.cs
@@ -353,19 +353,19 @@ public class Content : ContentBase, IContent
         // Special check here since we want to check if the request is for changed cultures
         if (propertyName.StartsWith(ChangeTrackingPrefix.PublishedCulture))
         {
-            var culture = propertyName.TrimStartExact(ChangeTrackingPrefix.PublishedCulture);
+            var culture = propertyName.TrimStart(ChangeTrackingPrefix.PublishedCulture);
             return _currentPublishCultureChanges.addedCultures?.Contains(culture) ?? false;
         }
 
         if (propertyName.StartsWith(ChangeTrackingPrefix.UnpublishedCulture))
         {
-            var culture = propertyName.TrimStartExact(ChangeTrackingPrefix.UnpublishedCulture);
+            var culture = propertyName.TrimStart(ChangeTrackingPrefix.UnpublishedCulture);
             return _currentPublishCultureChanges.removedCultures?.Contains(culture) ?? false;
         }
 
         if (propertyName.StartsWith(ChangeTrackingPrefix.ChangedCulture))
         {
-            var culture = propertyName.TrimStartExact(ChangeTrackingPrefix.ChangedCulture);
+            var culture = propertyName.TrimStart(ChangeTrackingPrefix.ChangedCulture);
             return _currentPublishCultureChanges.updatedCultures?.Contains(culture) ?? false;
         }
 
@@ -379,19 +379,19 @@ public class Content : ContentBase, IContent
         // Special check here since we want to check if the request is for changed cultures
         if (propertyName.StartsWith(ChangeTrackingPrefix.PublishedCulture))
         {
-            var culture = propertyName.TrimStartExact(ChangeTrackingPrefix.PublishedCulture);
+            var culture = propertyName.TrimStart(ChangeTrackingPrefix.PublishedCulture);
             return _previousPublishCultureChanges.addedCultures?.Contains(culture) ?? false;
         }
 
         if (propertyName.StartsWith(ChangeTrackingPrefix.UnpublishedCulture))
         {
-            var culture = propertyName.TrimStartExact(ChangeTrackingPrefix.UnpublishedCulture);
+            var culture = propertyName.TrimStart(ChangeTrackingPrefix.UnpublishedCulture);
             return _previousPublishCultureChanges.removedCultures?.Contains(culture) ?? false;
         }
 
         if (propertyName.StartsWith(ChangeTrackingPrefix.ChangedCulture))
         {
-            var culture = propertyName.TrimStartExact(ChangeTrackingPrefix.ChangedCulture);
+            var culture = propertyName.TrimStart(ChangeTrackingPrefix.ChangedCulture);
             return _previousPublishCultureChanges.updatedCultures?.Contains(culture) ?? false;
         }
 
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 99f44935ca..380c3ac523 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -578,19 +578,19 @@ public abstract class ContentBase : TreeEntityBase, IContentBase
         // Special check here since we want to check if the request is for changed cultures
         if (propertyName.StartsWith(ChangeTrackingPrefix.AddedCulture))
         {
-            var culture = propertyName.TrimStartExact(ChangeTrackingPrefix.AddedCulture);
+            var culture = propertyName.TrimStart(ChangeTrackingPrefix.AddedCulture);
             return _currentCultureChanges.addedCultures?.Contains(culture) ?? false;
         }
 
         if (propertyName.StartsWith(ChangeTrackingPrefix.RemovedCulture))
         {
-            var culture = propertyName.TrimStartExact(ChangeTrackingPrefix.RemovedCulture);
+            var culture = propertyName.TrimStart(ChangeTrackingPrefix.RemovedCulture);
             return _currentCultureChanges.removedCultures?.Contains(culture) ?? false;
         }
 
         if (propertyName.StartsWith(ChangeTrackingPrefix.UpdatedCulture))
         {
-            var culture = propertyName.TrimStartExact(ChangeTrackingPrefix.UpdatedCulture);
+            var culture = propertyName.TrimStart(ChangeTrackingPrefix.UpdatedCulture);
             return _currentCultureChanges.updatedCultures?.Contains(culture) ?? false;
         }
 
@@ -609,19 +609,19 @@ public abstract class ContentBase : TreeEntityBase, IContentBase
         // Special check here since we want to check if the request is for changed cultures
         if (propertyName.StartsWith(ChangeTrackingPrefix.AddedCulture))
         {
-            var culture = propertyName.TrimStartExact(ChangeTrackingPrefix.AddedCulture);
+            var culture = propertyName.TrimStart(ChangeTrackingPrefix.AddedCulture);
             return _previousCultureChanges.addedCultures?.Contains(culture) ?? false;
         }
 
         if (propertyName.StartsWith(ChangeTrackingPrefix.RemovedCulture))
         {
-            var culture = propertyName.TrimStartExact(ChangeTrackingPrefix.RemovedCulture);
+            var culture = propertyName.TrimStart(ChangeTrackingPrefix.RemovedCulture);
             return _previousCultureChanges.removedCultures?.Contains(culture) ?? false;
         }
 
         if (propertyName.StartsWith(ChangeTrackingPrefix.UpdatedCulture))
         {
-            var culture = propertyName.TrimStartExact(ChangeTrackingPrefix.UpdatedCulture);
+            var culture = propertyName.TrimStart(ChangeTrackingPrefix.UpdatedCulture);
             return _previousCultureChanges.updatedCultures?.Contains(culture) ?? false;
         }
 
diff --git a/src/Umbraco.Core/Routing/UmbracoRequestPaths.cs b/src/Umbraco.Core/Routing/UmbracoRequestPaths.cs
index a4c0ecd3b5..a5083a77c9 100644
--- a/src/Umbraco.Core/Routing/UmbracoRequestPaths.cs
+++ b/src/Umbraco.Core/Routing/UmbracoRequestPaths.cs
@@ -30,7 +30,7 @@ public class UmbracoRequestPaths
         _appPath = hostingEnvironment.ApplicationVirtualPath;
 
         _backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment)
-            .EnsureStartsWith('/').TrimStartExact(_appPath).EnsureStartsWith('/');
+            .EnsureStartsWith('/').TrimStart(_appPath).EnsureStartsWith('/');
 
         string mvcArea = globalSettings.Value.GetUmbracoMvcArea(hostingEnvironment);
 
@@ -73,7 +73,7 @@ public class UmbracoRequestPaths
     /// </remarks>
     public bool IsBackOfficeRequest(string absPath)
     {
-        string urlPath = absPath.TrimStartExact(_appPath).EnsureStartsWith('/');
+        string urlPath = absPath.TrimStart(_appPath).EnsureStartsWith('/');
 
         // check if this is in the umbraco back office
         if (!urlPath.InvariantStartsWith(_backOfficePath))
diff --git a/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs b/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
index 7f78b07a1a..82d33ee480 100644
--- a/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
+++ b/src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
@@ -246,7 +246,7 @@ public class BackOfficeExamineSearcher : IBackOfficeExamineSearcher
                         for (var index = 0; index < querywords.Length; index++)
                         {
                             queryWordsReplaced[index] =
-                                querywords[index].Replace("\\-", " ").Replace("_", " ").TrimExact(" ");
+                                querywords[index].Replace("\\-", " ").Replace("_", " ").Trim(" ");
                         }
                     }
                     else
diff --git a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs
index 4dcf57e7dc..00f5be31a3 100644
--- a/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs
+++ b/src/Umbraco.Examine.Lucene/LuceneIndexDiagnostics.cs
@@ -64,7 +64,7 @@ public class LuceneIndexDiagnostics : IIndexDiagnostics
             {
                 var rootDir = _hostingEnvironment.ApplicationPhysicalPath;
                 d["LuceneIndexFolder"] = fsDir.Directory.ToString().ToLowerInvariant()
-                    .TrimStartExact(rootDir.ToLowerInvariant()).Replace("\\", " /").EnsureStartsWith('/');
+                    .TrimStart(rootDir.ToLowerInvariant()).Replace("\\", " /").EnsureStartsWith('/');
             }
 
             if (_indexOptions != null)
diff --git a/src/Umbraco.Infrastructure/DeliveryApi/ApiRichTextElementParser.cs b/src/Umbraco.Infrastructure/DeliveryApi/ApiRichTextElementParser.cs
index 527d1e1547..0ead853459 100644
--- a/src/Umbraco.Infrastructure/DeliveryApi/ApiRichTextElementParser.cs
+++ b/src/Umbraco.Infrastructure/DeliveryApi/ApiRichTextElementParser.cs
@@ -190,7 +190,7 @@ internal sealed class ApiRichTextElementParser : ApiRichTextParserBase, IApiRich
 
         foreach (KeyValuePair<string, object> dataAttribute in dataAttributes)
         {
-            var actualKey = dataAttribute.Key.TrimStartExact("data-");
+            var actualKey = dataAttribute.Key.TrimStart("data-");
             attributes.TryAdd(actualKey, dataAttribute.Value);
 
             attributes.Remove(dataAttribute.Key);
diff --git a/src/Umbraco.Infrastructure/Install/FilePermissionHelper.cs b/src/Umbraco.Infrastructure/Install/FilePermissionHelper.cs
index 6fb1758b39..92ed6ced14 100644
--- a/src/Umbraco.Infrastructure/Install/FilePermissionHelper.cs
+++ b/src/Umbraco.Infrastructure/Install/FilePermissionHelper.cs
@@ -93,7 +93,7 @@ public class FilePermissionHelper : IFilePermissionHelper
 
             temp ??= new List<string>();
 
-            temp.Add(dir.TrimStartExact(_basePath));
+            temp.Add(dir.TrimStart(_basePath));
             success = false;
         }
 
@@ -115,7 +115,7 @@ public class FilePermissionHelper : IFilePermissionHelper
 
             temp ??= new List<string>();
 
-            temp.Add(file.TrimStartExact(_basePath));
+            temp.Add(file.TrimStart(_basePath));
             success = false;
         }
 
diff --git a/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs b/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
index 45e4710c7e..b983f3e663 100644
--- a/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
+++ b/src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
@@ -95,7 +95,7 @@ namespace Umbraco.Extensions
 
             //Set this environment variable - so that it can be used in external config file
             //add key="serilog:write-to:RollingFile.pathFormat" value="%BASEDIR%\logs\log.txt" />
-            Environment.SetEnvironmentVariable("BASEDIR", hostEnvironment.MapPathContentRoot("/").TrimEndExact("\\"), EnvironmentVariableTarget.Process);
+            Environment.SetEnvironmentVariable("BASEDIR", hostEnvironment.MapPathContentRoot("/").TrimEnd("\\"), EnvironmentVariableTarget.Process);
             Environment.SetEnvironmentVariable("UMBLOGDIR", loggingConfiguration.LogDirectory, EnvironmentVariableTarget.Process);
             Environment.SetEnvironmentVariable("MACHINENAME", Environment.MachineName, EnvironmentVariableTarget.Process);
 
diff --git a/src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs b/src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs
index 7a8d42184c..d8ec012dd6 100644
--- a/src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs
+++ b/src/Umbraco.Infrastructure/Persistence/NPocoSqlExtensions.cs
@@ -226,7 +226,7 @@ namespace Umbraco.Extensions
 
                 var temp = new Sql<ISqlContext>(sql.SqlContext);
                 temp = predicates[i](temp);
-                wsql.Append(temp.SQL.TrimStartExact("WHERE "), temp.Arguments);
+                wsql.Append(temp.SQL.TrimStart("WHERE "), temp.Arguments);
             }
             wsql.Append(")");
 
@@ -615,7 +615,7 @@ namespace Umbraco.Extensions
         {
             var sql = new Sql<ISqlContext>(sqlJoin.SqlContext);
             sql = on(sql);
-            var text = sql.SQL.Trim().TrimStartExact("WHERE").Trim();
+            var text = sql.SQL.Trim().TrimStart("WHERE").Trim();
             return sqlJoin.On(text, sql.Arguments);
         }
 
diff --git a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs
index 725ca1c61c..23cb633c5a 100644
--- a/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs
+++ b/src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs
@@ -1213,7 +1213,7 @@ SELECT 4 AS [Key], COUNT(id) AS [Value] FROM umbracoUser WHERE userDisabled = 0
         var args = filterSql.Arguments;
         var sqlFilter = hasWhereClause
             ? filterSql.SQL
-            : " WHERE " + filterSql.SQL.TrimStartExact("AND ");
+            : " WHERE " + filterSql.SQL.TrimStart("AND ");
 
         sql.Append(SqlContext.Sql(sqlFilter, args));
 
diff --git a/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs b/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
index fe33fbe7b6..089bc23814 100644
--- a/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
+++ b/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
@@ -306,7 +306,7 @@ public abstract class SqlSyntaxProviderBase<TSyntax> : ISqlSyntaxProvider
             sb.Append(Format(column) + ",\n");
         }
 
-        return sb.ToString().TrimEndExact(",\n");
+        return sb.ToString().TrimEnd(",\n");
     }
 
     public virtual string Format(ColumnDefinition column) =>
diff --git a/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs b/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs
index df153c510b..ada8f64fdf 100644
--- a/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/ApplicationBuilderExtensions.cs
@@ -192,7 +192,7 @@ public static class ApplicationBuilderExtensions
     public static IApplicationBuilder UseUmbracoBackOfficeRewrites(this IApplicationBuilder builder)
     {
         IBackOfficePathGenerator backOfficePathGenerator = builder.ApplicationServices.GetRequiredService<IBackOfficePathGenerator>();
-        var backOfficeAssetsPath = backOfficePathGenerator.BackOfficeAssetsPath.TrimStartExact("/").EnsureEndsWith("/");
+        var backOfficeAssetsPath = backOfficePathGenerator.BackOfficeAssetsPath.TrimStart("/").EnsureEndsWith("/");
 
         builder.UseRewriter(new RewriteOptions()
             // The destination needs to be hardcoded to "/umbraco/backoffice" because this is where they are located in the Umbraco.Cms.StaticAssets RCL
diff --git a/src/Umbraco.Web.Common/Extensions/LinkGeneratorExtensions.cs b/src/Umbraco.Web.Common/Extensions/LinkGeneratorExtensions.cs
index 9775a382ab..276925e796 100644
--- a/src/Umbraco.Web.Common/Extensions/LinkGeneratorExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/LinkGeneratorExtensions.cs
@@ -40,7 +40,7 @@ public static class LinkGeneratorExtensions
                                              " or the result ");
         }
 
-        return linkGenerator.GetUmbracoApiService<T>(method.Name)?.TrimEndExact(method.Name);
+        return linkGenerator.GetUmbracoApiService<T>(method.Name)?.TrimEnd(method.Name);
     }
 
     /// <summary>
diff --git a/src/Umbraco.Web.Common/Extensions/UrlHelperExtensions.cs b/src/Umbraco.Web.Common/Extensions/UrlHelperExtensions.cs
index 82c4469be0..34bc870f94 100644
--- a/src/Umbraco.Web.Common/Extensions/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/UrlHelperExtensions.cs
@@ -197,7 +197,7 @@ public static class UrlHelperExtensions
         UmbracoApiControllerTypeCollection umbracoApiControllerTypeCollection,
         string actionName)
         where T : UmbracoApiController =>
-        url.GetUmbracoApiService<T>(umbracoApiControllerTypeCollection, actionName)?.TrimEndExact(actionName);
+        url.GetUmbracoApiService<T>(umbracoApiControllerTypeCollection, actionName)?.TrimEnd(actionName);
 
     [Obsolete("This will be removed in Umbraco 15.")]
     public static string? GetUmbracoApiServiceBaseUrl<T>(
@@ -213,7 +213,7 @@ public static class UrlHelperExtensions
                                              " or the result ");
         }
 
-        return url.GetUmbracoApiService<T>(umbracoApiControllerTypeCollection, method.Name)?.TrimEndExact(method.Name);
+        return url.GetUmbracoApiService<T>(umbracoApiControllerTypeCollection, method.Name)?.TrimEnd(method.Name);
     }
 
     /// <summary>
diff --git a/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs b/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
index e08a72a8a6..f99e6dfbf5 100644
--- a/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -130,7 +130,7 @@ public static class UmbracoBuilderExtensions
                     uiProject.Create();
                 }
 
-                var mainLangFolder = new DirectoryInfo(Path.Combine(uiProject.FullName, Constants.System.DefaultUmbracoPath.TrimStartExact("~/"), "config", "lang"));
+                var mainLangFolder = new DirectoryInfo(Path.Combine(uiProject.FullName, Constants.System.DefaultUmbracoPath.TrimStart("~/"), "config", "lang"));
 
                 return new LocalizedTextServiceFileSources(
                     loggerFactory.CreateLogger<LocalizedTextServiceFileSources>(),
diff --git a/tests/Umbraco.Tests.Integration/ManagementApi/ManagementApiTest.cs b/tests/Umbraco.Tests.Integration/ManagementApi/ManagementApiTest.cs
index e5b0644109..bc83d90a46 100644
--- a/tests/Umbraco.Tests.Integration/ManagementApi/ManagementApiTest.cs
+++ b/tests/Umbraco.Tests.Integration/ManagementApi/ManagementApiTest.cs
@@ -111,7 +111,7 @@ public abstract class ManagementApiTest<T> : UmbracoTestServerTestBase
 
         var codeVerifier = "12345"; // Just a dummy value we use in tests
         var codeChallange = Convert.ToBase64String(SHA256.Create().ComputeHash(Encoding.UTF8.GetBytes(codeVerifier)))
-            .TrimEndExact("=");
+            .TrimEnd("=");
 
         var authorizationUrl = GetManagementApiUrl<BackOfficeController>(x => x.Authorize(CancellationToken.None)) +
                   $"?client_id={backofficeOpenIddictApplicationDescriptor.ClientId}&response_type=code&redirect_uri={WebUtility.UrlEncode(backofficeOpenIddictApplicationDescriptor.RedirectUris.FirstOrDefault()?.AbsoluteUri)}&code_challenge_method=S256&code_challenge={codeChallange}";
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExternalIndexSearcherTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExternalIndexSearcherTest.cs
index 9d8998daeb..a6e2891447 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExternalIndexSearcherTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExternalIndexSearcherTest.cs
@@ -240,7 +240,7 @@ public class ExamineExternalIndexSearcherTest : IExamineExternalIndexSearcherTes
                         for (var index = 0; index < querywords.Length; index++)
                         {
                             queryWordsReplaced[index] =
-                                querywords[index].Replace("\\-", " ").Replace("_", " ").TrimExact(" ");
+                                querywords[index].Replace("\\-", " ").Replace("_", " ").Trim(" ");
                         }
                     }
                     else
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs
index e3afda8d4f..6e959e45f4 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs
@@ -88,7 +88,7 @@ public class StringExtensionsTests
     [TestCase("Hello this is my string string", "Hello this is my string string", "")]
     public void TrimEnd(string input, string forTrimming, string shouldBe)
     {
-        var trimmed = input.TrimEndExact(forTrimming);
+        var trimmed = input.TrimEnd(forTrimming);
         Assert.AreEqual(shouldBe, trimmed);
     }
 
@@ -98,7 +98,7 @@ public class StringExtensionsTests
     [TestCase("Hello this is my string", "Hello this is my string", "")]
     public void TrimStart(string input, string forTrimming, string shouldBe)
     {
-        var trimmed = input.TrimStartExact(forTrimming);
+        var trimmed = input.TrimStart(forTrimming);
         Assert.AreEqual(shouldBe, trimmed);
     }
 
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs
index 372171a57d..708a6a3ba4 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs
@@ -203,7 +203,7 @@ public class NPocoSqlTemplateTests
             .Append("AND whatever=@0", SqlTemplate.Arg("k")));
 
         sql = template.Sql(new { j = new[] { 1, 2, 3 }, k = "oops" });
-        Assert.AreEqual(sqlBase.TrimEndExact("WHERE ") + "AND whatever=@0,@1,@2 AND whatever=@3", sql.SQL.NoCrLf());
+        Assert.AreEqual(sqlBase.TrimEnd("WHERE ") + "AND whatever=@0,@1,@2 AND whatever=@3", sql.SQL.NoCrLf());
         Assert.AreEqual(4, sql.Arguments.Length);
         Assert.AreEqual(1, sql.Arguments[0]);
         Assert.AreEqual(2, sql.Arguments[1]);