Version 2.x (#1359)

* Version 2.x

* Setup .NET 9

* 12

* cleanup some #if for NETSTANDARD1_3

* cleanup + fix tests for net8

* openapi

* NO ConfigureAwait(false) + cleanup

* .

* #endif

* HashSet

* WireMock.Net.NUnit

* HttpContext

* Add WebSockets (#1423)

* Add WebSockets

* Add tests

* fix

* more tests

* Add tests

* ...

* remove IOwin

* -

* tests

* fluent

* ok

* match

* .

* byte[]

* x

* func

* func

* byte

* trans

* ...

* frameworks.........

* jmes

* xxx

* sc

* using var httpClient = new HttpClient();

* usings

* maxRetries

* up

* xunit v3

* ct

* ---

* ct

* ct2

* T Unit

* WireMock.Net.TUnitTests / 10

* t unit first

* --project

* no tunit

* t2

* --project

* --project

* ci -  --project

* publish ./test/wiremock-coverage.xml

* windows

* .

* log

* ...

* log

* goed

* BodyType

* .

* .

* --scenario

* ...

* pact

* ct

* .

* WireMock.Net.RestClient.AwesomeAssertions (#1427)

* WireMock.Net.RestClient.AwesomeAssertions

* ok

* atpath

* fix test

* sonar fixes

* ports

* proxy test

* FIX?

* ---

* await Task.Delay(100, _ct);

* ?

* --project

* Aspire: use IDistributedApplicationEventingSubscriber (#1428)

* broadcast

* ok

* more tsts

* .

* Collection

* up

* .

* 2

* remove nfluent

* <VersionPrefix>2.0.0-preview-02</VersionPrefix>

* ...

* .

* nuget icon

* .

* <PackageReference Include="JmesPath.Net" Version="1.1.0" />

* x

* 500

* .

* fix some warnings

* ws

src/WireMock.Net.Minimal/Util/ConcurrentObservableCollection.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 

src/WireMock.Net.Minimal/Util/CultureInfoExtensions.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
 using System.Globalization;
 
 namespace WireMock.Util;
@@ -18,12 +17,11 @@ internal static class CultureInfoUtils
 
         try
         {
-#if !NETSTANDARD1_3
             if (int.TryParse(value, out var culture))
             {
                 return new CultureInfo(culture);
             }
-#endif
+
             if (string.Equals(value, nameof(CultureInfo.CurrentCulture), StringComparison.OrdinalIgnoreCase))
             {
                 return CultureInfo.CurrentCulture;

src/WireMock.Net.Minimal/Util/DateTimeUtils.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-
 namespace WireMock.Util;
 
 internal interface IDateTimeUtils

src/WireMock.Net.Minimal/Util/DictionaryExtensions.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-using System.Collections.Generic;
 using Stef.Validation;
 
 namespace WireMock.Util;

src/WireMock.Net.Minimal/Util/EnhancedFileSystemWatcher.cs

@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net
 
-using System;
 using System.Collections.Concurrent;
-using System.IO;
 using JetBrains.Annotations;
 using Stef.Validation;
 

src/WireMock.Net.Minimal/Util/FileHelper.cs

@@ -1,7 +1,6 @@
 // Copyright © WireMock.Net
 
 using System.Diagnostics.CodeAnalysis;
-using System.Threading;
 using Stef.Validation;
 using WireMock.Handlers;
 

src/WireMock.Net.Minimal/Util/GuidUtils.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-
 namespace WireMock.Util;
 
 internal interface IGuidUtils

src/WireMock.Net.Minimal/Util/HttpStatusRangeParser.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
 using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;

src/WireMock.Net.Minimal/Util/PortUtils.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Net;
@@ -16,7 +14,7 @@ namespace WireMock.Util;
 /// </summary>
 internal static class PortUtils
 {
-    private static readonly Regex UrlDetailsRegex = new(@"^((?<proto>\w+)://)(?<host>[^/]+?):(?<port>\d+)\/?$", RegexOptions.Compiled, RegexConstants.DefaultTimeout);
+    private static readonly Regex UrlDetailsRegex = new(@"^((?<scheme>\w+)://)(?<host>[^/]+?):(?<port>\d+)\/?$", RegexOptions.Compiled, RegexConstants.DefaultTimeout);
 
     /// <summary>
     /// Finds a random, free port to be listened on.
@@ -37,9 +35,7 @@ internal static class PortUtils
         }
         finally
         {
-#if !NETSTANDARD1_3
             portSocket.Close();
-#endif
             portSocket.Dispose();
         }
     }
@@ -75,11 +71,11 @@ internal static class PortUtils
         {
             foreach (var socket in sockets)
             {
-#if !NETSTANDARD1_3
                 socket.Close();
-#endif
                 socket.Dispose();
             }
+
+            Thread.Sleep(100); // Give the OS some time to release the ports
         }
     }
 
@@ -97,8 +93,8 @@ internal static class PortUtils
         var match = UrlDetailsRegex.Match(url);
         if (match.Success)
         {
-            scheme = match.Groups["proto"].Value;
-            isHttps = scheme.StartsWith("https", StringComparison.OrdinalIgnoreCase) || scheme.StartsWith("grpcs", StringComparison.OrdinalIgnoreCase);
+            scheme = match.Groups["scheme"].Value;
+            isHttps = scheme.StartsWith("https", StringComparison.OrdinalIgnoreCase) || scheme.StartsWith("grpcs", StringComparison.OrdinalIgnoreCase) || scheme.StartsWith("wss", StringComparison.OrdinalIgnoreCase);
             isHttp2 = scheme.StartsWith("grpc", StringComparison.OrdinalIgnoreCase);
             host = match.Groups["host"].Value;
 

src/WireMock.Net.Minimal/Util/RegexUtils.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using WireMock.Constants;
 using WireMock.RegularExpressions;

src/WireMock.Net.Minimal/Util/StreamUtils.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.IO;
 using System.Text;
 
 namespace WireMock.Util;

src/WireMock.Net.Minimal/Util/StringUtils.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text.RegularExpressions;

src/WireMock.Net.Minimal/Util/TinyMapperUtils.cs

@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net
 
+using System.Diagnostics.CodeAnalysis;
 using Nelibur.ObjectMapper;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Settings;
@@ -7,6 +8,7 @@ using WireMock.Settings;
 
 namespace WireMock.Util;
 
+[SuppressMessage("Performance", "CA1822:Mark members as static")]
 internal sealed class TinyMapperUtils
 {
     public static TinyMapperUtils Instance { get; } = new();
@@ -22,6 +24,9 @@ internal sealed class TinyMapperUtils
         TinyMapper.Bind<WebProxySettingsModel, WebProxySettings>();
         TinyMapper.Bind<WebProxyModel, WebProxySettings>();
         TinyMapper.Bind<ProxyUrlReplaceSettingsModel, ProxyUrlReplaceSettings>();
+
+        TinyMapper.Bind<WebSocketSettings, WebSocketSettingsModel>();
+        TinyMapper.Bind<WebSocketSettingsModel, WebSocketSettings>();
     }
 
     public ProxyAndRecordSettingsModel? Map(ProxyAndRecordSettings? instance)
@@ -53,4 +58,14 @@ internal sealed class TinyMapperUtils
     {
         return model == null ? null : TinyMapper.Map<WebProxySettings>(model);
     }
+
+    public WebSocketSettingsModel? Map(WebSocketSettings? instance)
+    {
+        return instance == null ? null : TinyMapper.Map<WebSocketSettingsModel>(instance);
+    }
+
+    public WebSocketSettings? Map(WebSocketSettingsModel? model)
+    {
+        return model == null ? null : TinyMapper.Map<WebSocketSettings>(model);
+    }
 }

src/WireMock.Net.Minimal/Util/UrlUtils.cs

@@ -1,13 +1,8 @@
 // Copyright © WireMock.Net
 
-using System;
+using Microsoft.AspNetCore.Http;
 using WireMock.Models;
 using Stef.Validation;
-#if !USE_ASPNETCORE
-using Microsoft.Owin;
-#else
-using Microsoft.AspNetCore.Http;
-#endif
 
 namespace WireMock.Util;