jmes

Directory.Build.props

@@ -69,27 +69,7 @@
         </PackageReference> -->
     </ItemGroup>
 
-    <!--<ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
-        <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' ">
         <PackageReference Include="Required" Version="1.0.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/WireMock.Net.Minimal/Compatibility/StringExtensions.cs

@@ -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

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;

src/WireMock.Net.Minimal/Matchers/FuncMatcher.cs

@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net
 
+using System;
 using Stef.Validation;
 using WireMock.Extensions;
 

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;

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;

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;
 

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;

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}'.");

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;

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;

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;

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">

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" />

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)
+    //internal static IEnumerable<T> ReverseEx<T>(this IEnumerable<T> source)
-    {
+    //{
-        var stack = new Stack<T>();
+    //    var stack = new Stack<T>();
 
-        foreach (var item in source)
+    //    foreach (var item in source)
-        {
+    //    {
-            stack.Push(item);
+    //        stack.Push(item);
-        }
+    //    }
 
-        while (stack.Count > 0)
+    //    while (stack.Count > 0)
-        {
+    //    {
-            yield return stack.Pop();
+    //        yield return stack.Pop();
-        }
+    //    }
-    }
+    //}
 }

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(
+    public static string Replace(this string text, string oldValue, string newValue, StringComparison stringComparison)
-            this string source,
-            string oldValue,
-            string? newValue,
-            StringComparison comparisonType)
     {
-        if (source == null)
+        var options = stringComparison == StringComparison.OrdinalIgnoreCase ? RegexOptions.IgnoreCase : RegexOptions.None;
-        {
+        return Regex.Replace(text, oldValue, newValue, options, RegexConstants.DefaultTimeout);
-            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();
     }
 #endif
 }

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;

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;

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>

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>

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>