From d678048aaee45dd49df809fb370d95bc8bb20712 Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <stef.heyenrath@gmail.com>
Date: Fri, 13 Feb 2026 14:03:40 +0100
Subject: [PATCH] jmes

---
 Directory.Build.props                         | 22 +--------
 .../Compatibility/StringExtensions.cs         | 18 -------
 .../Http/HttpClientFactory2.cs                |  2 +-
 .../Matchers/FuncMatcher.cs                   |  1 +
 .../Owin/AspNetCoreSelfHost.cs                |  2 +
 .../Owin/Mappers/OwinRequestMapper.cs         |  1 +
 .../RequestBuilders/Request.WithWebSocket.cs  |  1 +
 .../RequestBuilders/Request.cs                |  1 +
 .../Server/WireMockServer.Admin.cs            |  6 +--
 src/WireMock.Net.Minimal/Util/PortUtils.cs    |  1 +
 .../WebSockets/WebSocketBuilder.cs            |  1 +
 .../WebSockets/WebSocketConnectionRegistry.cs |  1 +
 .../WireMock.Net.Minimal.csproj               |  5 +-
 .../WireMock.Net.OpenApiParser.csproj         |  4 +-
 .../Extensions/EnumerableExtensions.cs        | 24 ++++-----
 .../Extensions/StringExtensions.cs            | 49 ++-----------------
 .../Matchers/MatchResult.cs                   |  1 +
 .../WebSockets/IWebSocketBuilder.cs           |  1 +
 .../WireMock.Net.Shared.csproj                |  4 +-
 .../WireMock.Net.TUnit.csproj                 |  2 +-
 .../WireMock.Net.xUnit.csproj                 |  2 +-
 21 files changed, 41 insertions(+), 108 deletions(-)
 delete mode 100644 src/WireMock.Net.Minimal/Compatibility/StringExtensions.cs

diff --git a/Directory.Build.props b/Directory.Build.props
index 72195c96..8f994548 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -69,27 +69,7 @@
         </PackageReference> -->
     </ItemGroup>
 
-    <!--<ItemGroup>
-        <PackageReference Include="PolyfillLib" Version="9.8.1" />
-    </ItemGroup>-->
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-        <PackageReference Include="Required" Version="1.0.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="IsExternalInit" Version="1.0.3">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Nullable" Version="1.3.1">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
         <PackageReference Include="Required" Version="1.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/WireMock.Net.Minimal/Compatibility/StringExtensions.cs b/src/WireMock.Net.Minimal/Compatibility/StringExtensions.cs
deleted file mode 100644
index 447aa48b..00000000
--- a/src/WireMock.Net.Minimal/Compatibility/StringExtensions.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright © WireMock.Net
-
-#if NET48
-using System.Text.RegularExpressions;
-using WireMock.Constants;
-
-// ReSharper disable once CheckNamespace
-namespace System;
-
-internal static class StringExtensions
-{
-    public static string Replace(this string text, string oldValue, string newValue, StringComparison stringComparison)
-    {
-        var options = stringComparison == StringComparison.OrdinalIgnoreCase ? RegexOptions.IgnoreCase : RegexOptions.None;
-        return Regex.Replace(text, oldValue, newValue, options, RegexConstants.DefaultTimeout);
-    }
-}
-#endif
\ No newline at end of file
diff --git a/src/WireMock.Net.Minimal/Http/HttpClientFactory2.cs b/src/WireMock.Net.Minimal/Http/HttpClientFactory2.cs
index d86b2016..d5c013c0 100644
--- a/src/WireMock.Net.Minimal/Http/HttpClientFactory2.cs
+++ b/src/WireMock.Net.Minimal/Http/HttpClientFactory2.cs
@@ -28,7 +28,7 @@ internal static class HttpClientFactory2
 
         var next = handler;
 
-        foreach (var delegatingHandler in delegatingHandlers.ReverseEx())
+        foreach (var delegatingHandler in Enumerable.Reverse(delegatingHandlers))
         {
             delegatingHandler.InnerHandler = next;
             next = delegatingHandler;
diff --git a/src/WireMock.Net.Minimal/Matchers/FuncMatcher.cs b/src/WireMock.Net.Minimal/Matchers/FuncMatcher.cs
index 6884f542..6c34ab88 100644
--- a/src/WireMock.Net.Minimal/Matchers/FuncMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/FuncMatcher.cs
@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net
 
+using System;
 using Stef.Validation;
 using WireMock.Extensions;
 
diff --git a/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.cs b/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.cs
index 53013fbd..636662bb 100644
--- a/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.cs
+++ b/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.cs
@@ -1,5 +1,7 @@
 // Copyright © WireMock.Net
 
+using System;
+using System.Linq;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/src/WireMock.Net.Minimal/Owin/Mappers/OwinRequestMapper.cs b/src/WireMock.Net.Minimal/Owin/Mappers/OwinRequestMapper.cs
index 53b15441..ace4844c 100644
--- a/src/WireMock.Net.Minimal/Owin/Mappers/OwinRequestMapper.cs
+++ b/src/WireMock.Net.Minimal/Owin/Mappers/OwinRequestMapper.cs
@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net
 
+using System.Linq;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using WireMock.Http;
diff --git a/src/WireMock.Net.Minimal/RequestBuilders/Request.WithWebSocket.cs b/src/WireMock.Net.Minimal/RequestBuilders/Request.WithWebSocket.cs
index 3ff53da1..f177be48 100644
--- a/src/WireMock.Net.Minimal/RequestBuilders/Request.WithWebSocket.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/Request.WithWebSocket.cs
@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net
 
+using System.Linq;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
 
diff --git a/src/WireMock.Net.Minimal/RequestBuilders/Request.cs b/src/WireMock.Net.Minimal/RequestBuilders/Request.cs
index ff315b5a..aac67bab 100644
--- a/src/WireMock.Net.Minimal/RequestBuilders/Request.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/Request.cs
@@ -4,6 +4,7 @@
 // For more details see 'mock4net/LICENSE.txt' and 'mock4net/readme.md' in this project root.
 using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using Stef.Validation;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
diff --git a/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs b/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs
index 2f4d2fc8..41d5e222 100644
--- a/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs
+++ b/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs
@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net
 
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net;
 using System.Text;
@@ -702,7 +700,7 @@ public partial class WireMockServer
     {
         var name = string.Equals(HttpRequestMethod.DELETE, requestMessage.Method, StringComparison.OrdinalIgnoreCase) ?
             requestMessage.Path.Substring(_adminPaths!.Scenarios.Length + 1) :
-            requestMessage.Path.Split('/').ReverseEx().Skip(1).First();
+            Enumerable.Reverse(requestMessage.Path.Split('/')).Skip(1).First();
 
         return ResetScenario(name) ?
             ResponseMessageBuilder.Create(200, "Scenario reset") :
@@ -711,7 +709,7 @@ public partial class WireMockServer
 
     private IResponseMessage ScenariosSetState(HttpContext _, IRequestMessage requestMessage)
     {
-        var name = requestMessage.Path.Split('/').ReverseEx().Skip(1).First();
+        var name = Enumerable.Reverse(requestMessage.Path.Split('/')).Skip(1).First();
         if (!_options.Scenarios.ContainsKey(name))
         {
             ResponseMessageBuilder.Create(HttpStatusCode.NotFound, $"No scenario found by name '{name}'.");
diff --git a/src/WireMock.Net.Minimal/Util/PortUtils.cs b/src/WireMock.Net.Minimal/Util/PortUtils.cs
index ef8e3560..49277008 100644
--- a/src/WireMock.Net.Minimal/Util/PortUtils.cs
+++ b/src/WireMock.Net.Minimal/Util/PortUtils.cs
@@ -1,6 +1,7 @@
 // Copyright © WireMock.Net
 
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Text.RegularExpressions;
diff --git a/src/WireMock.Net.Minimal/WebSockets/WebSocketBuilder.cs b/src/WireMock.Net.Minimal/WebSockets/WebSocketBuilder.cs
index 2ab7ea09..a47c46f3 100644
--- a/src/WireMock.Net.Minimal/WebSockets/WebSocketBuilder.cs
+++ b/src/WireMock.Net.Minimal/WebSockets/WebSocketBuilder.cs
@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net
 
+using System;
 using System.Net.WebSockets;
 using Stef.Validation;
 using WireMock.Matchers;
diff --git a/src/WireMock.Net.Minimal/WebSockets/WebSocketConnectionRegistry.cs b/src/WireMock.Net.Minimal/WebSockets/WebSocketConnectionRegistry.cs
index e8ec025c..bdb8d8b9 100644
--- a/src/WireMock.Net.Minimal/WebSockets/WebSocketConnectionRegistry.cs
+++ b/src/WireMock.Net.Minimal/WebSockets/WebSocketConnectionRegistry.cs
@@ -2,6 +2,7 @@
 
 using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Net.WebSockets;
 
 namespace WireMock.WebSockets;
diff --git a/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj b/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj
index d94d62d8..2f88d08f 100644
--- a/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj
+++ b/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj
@@ -38,10 +38,10 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="JmesPath.Net.SourceOnly" Version="1.0.330-20260213.1" />
         <PackageReference Include="NJsonSchema.Extensions" Version="0.1.0" />
         <PackageReference Include="NSwag.Core" Version="13.16.1" />
         <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
-        <PackageReference Include="JmesPath.Net" Version="1.0.330" />
         <PackageReference Include="TinyMapper.Signed" Version="4.0.0" />
         <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.34.0" />
         <PackageReference Include="Scriban.Signed" Version="5.5.0" />
@@ -52,8 +52,9 @@
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
-        <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
+        <!--<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />-->
         <PackageReference Include="Microsoft.AspNetCore" Version="2.3.9" />
+        <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.3.9" />
 
         <!-- Keep at 6.14.0 -->
         <!--<PackageReference Include="Polyfill" Version="6.14.0">
diff --git a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
index 07e9a92a..025f0b37 100644
--- a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
+++ b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <Description>An OpenApi (swagger) parser to generate MappingModel or mapping.json file.</Description>
@@ -33,7 +33,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
         <PackageReference Include="RamlToOpenApiConverter.SourceOnly" Version="0.11.0" />
         <PackageReference Include="YamlDotNet" Version="16.3.0" />
         <PackageReference Include="RandomDataGenerator.Net" Version="1.0.19" />
diff --git a/src/WireMock.Net.Shared/Extensions/EnumerableExtensions.cs b/src/WireMock.Net.Shared/Extensions/EnumerableExtensions.cs
index b0500179..3cd1b7fb 100644
--- a/src/WireMock.Net.Shared/Extensions/EnumerableExtensions.cs
+++ b/src/WireMock.Net.Shared/Extensions/EnumerableExtensions.cs
@@ -4,18 +4,18 @@ namespace System.Collections.Generic;
 
 internal static class EnumerableExtensions
 {
-    internal static IEnumerable<T> ReverseEx<T>(this IEnumerable<T> source)
-    {
-        var stack = new Stack<T>();
+    //internal static IEnumerable<T> ReverseEx<T>(this IEnumerable<T> source)
+    //{
+    //    var stack = new Stack<T>();
 
-        foreach (var item in source)
-        {
-            stack.Push(item);
-        }
+    //    foreach (var item in source)
+    //    {
+    //        stack.Push(item);
+    //    }
 
-        while (stack.Count > 0)
-        {
-            yield return stack.Pop();
-        }
-    }
+    //    while (stack.Count > 0)
+    //    {
+    //        yield return stack.Pop();
+    //    }
+    //}
 }
\ No newline at end of file
diff --git a/src/WireMock.Net.Shared/Extensions/StringExtensions.cs b/src/WireMock.Net.Shared/Extensions/StringExtensions.cs
index d43446d6..7fe67866 100644
--- a/src/WireMock.Net.Shared/Extensions/StringExtensions.cs
+++ b/src/WireMock.Net.Shared/Extensions/StringExtensions.cs
@@ -1,6 +1,8 @@
 // Copyright © WireMock.Net
 
 using System.Globalization;
+using System.Text.RegularExpressions;
+using WireMock.Constants;
 
 namespace System;
 
@@ -32,51 +34,10 @@ internal static class StringExtensions
     }
 
 #if !NET8_0_OR_GREATER
-    public static string Replace(
-            this string source,
-            string oldValue,
-            string? newValue,
-            StringComparison comparisonType)
+    public static string Replace(this string text, string oldValue, string newValue, StringComparison stringComparison)
     {
-        if (source == null)
-        {
-            throw new ArgumentNullException(nameof(source));
-        }
-
-        if (string.IsNullOrEmpty(oldValue))
-        {
-            throw new ArgumentException("oldValue cannot be null or empty.", nameof(oldValue));
-        }
-
-        newValue ??= string.Empty;
-
-        int pos = 0;
-        int index = source.IndexOf(oldValue, pos, comparisonType);
-
-        if (index < 0)
-        {
-            return source; // nothing to replace
-        }
-
-        var result = new System.Text.StringBuilder(source.Length);
-
-        while (index >= 0)
-        {
-            // append unchanged part
-            result.Append(source, pos, index - pos);
-
-            // append replacement
-            result.Append(newValue);
-
-            pos = index + oldValue.Length;
-
-            index = source.IndexOf(oldValue, pos, comparisonType);
-        }
-
-        // append remainder
-        result.Append(source, pos, source.Length - pos);
-
-        return result.ToString();
+        var options = stringComparison == StringComparison.OrdinalIgnoreCase ? RegexOptions.IgnoreCase : RegexOptions.None;
+        return Regex.Replace(text, oldValue, newValue, options, RegexConstants.DefaultTimeout);
     }
 #endif
 }
\ No newline at end of file
diff --git a/src/WireMock.Net.Shared/Matchers/MatchResult.cs b/src/WireMock.Net.Shared/Matchers/MatchResult.cs
index f6d8383a..a76f15fa 100644
--- a/src/WireMock.Net.Shared/Matchers/MatchResult.cs
+++ b/src/WireMock.Net.Shared/Matchers/MatchResult.cs
@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net
 
+using System.Linq;
 using Stef.Validation;
 using WireMock.Extensions;
 using WireMock.Matchers.Request;
diff --git a/src/WireMock.Net.Shared/WebSockets/IWebSocketBuilder.cs b/src/WireMock.Net.Shared/WebSockets/IWebSocketBuilder.cs
index b2ec07e9..e55ceb29 100644
--- a/src/WireMock.Net.Shared/WebSockets/IWebSocketBuilder.cs
+++ b/src/WireMock.Net.Shared/WebSockets/IWebSocketBuilder.cs
@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net
 
+using System;
 using JetBrains.Annotations;
 using WireMock.Matchers;
 using WireMock.Settings;
diff --git a/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj b/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj
index 883ff578..bda537d2 100644
--- a/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj
+++ b/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Description>Shared interfaces, models, enumerations and types.</Description>
         <Authors>Stef Heyenrath</Authors>
@@ -38,7 +38,7 @@
         <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.9" />
         <PackageReference Include="Stef.Validation" Version="0.2.0" />
         <PackageReference Include="AnyOf" Version="0.5.0.1" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
         <PackageReference Include="JsonConverter.Abstractions" Version="0.7.2" />
     </ItemGroup>
diff --git a/src/WireMock.Net.TUnit/WireMock.Net.TUnit.csproj b/src/WireMock.Net.TUnit/WireMock.Net.TUnit.csproj
index 5d753563..cfa3b464 100644
--- a/src/WireMock.Net.TUnit/WireMock.Net.TUnit.csproj
+++ b/src/WireMock.Net.TUnit/WireMock.Net.TUnit.csproj
@@ -26,7 +26,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
         <PackageReference Include="Stef.Validation" Version="0.2.0" />
         <PackageReference Include="TUnit.Core" Version="0.57.1" />
     </ItemGroup>
diff --git a/src/WireMock.Net.xUnit/WireMock.Net.xUnit.csproj b/src/WireMock.Net.xUnit/WireMock.Net.xUnit.csproj
index 001e84ac..4594beee 100644
--- a/src/WireMock.Net.xUnit/WireMock.Net.xUnit.csproj
+++ b/src/WireMock.Net.xUnit/WireMock.Net.xUnit.csproj
@@ -26,7 +26,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
         <PackageReference Include="Stef.Validation" Version="0.2.0" />
         <PackageReference Include="xUnit.abstractions" Version="2.0.3" />
     </ItemGroup>