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.Shared/Settings/ActivityTracingOptions.cs

@@ -39,4 +39,4 @@ public class ActivityTracingOptions
     /// Default is <c>true</c>.
     /// </summary>
     public bool RecordMatchDetails { get; set; } = true;
-}
+}

src/WireMock.Net.Shared/Settings/ProxyAndRecordSettings.cs

@@ -82,11 +82,13 @@ public class ProxyAndRecordSettings : HttpClientSettings
     [PublicAPI]
     public ProxyUrlReplaceSettings? ReplaceSettings { get; set; }
 
+    /*
     /// <summary>
     /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
     /// </summary>
     //[PublicAPI]
     //public bool PreferProxyMapping { get; set; }
+    */
 
     /// <summary>
     /// When SaveMapping is set to <c>true</c>, this setting can be used to control the behavior of the generated request matchers for the new mapping.

src/WireMock.Net.Shared/Settings/SimpleSettingsParser.cs

@@ -1,9 +1,6 @@
 // Copyright © WireMock.Net
 
-using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
 using WireMock.Extensions;
 using WireMock.Util;
 
@@ -197,6 +194,6 @@ internal class SimpleSettingsParser
     public T? GetObjectValueFromJson<T>(string name)
     {
         var value = GetValue(name, values => values.FirstOrDefault());
-        return string.IsNullOrWhiteSpace(value) ? default : JsonUtils.DeserializeObject<T>(value);
+        return string.IsNullOrWhiteSpace(value) ? default : JsonUtils.DeserializeObject<T>(value!);
     }
 }

src/WireMock.Net.Shared/Settings/WebSocketSettings.cs

@@ -0,0 +1,21 @@
+// Copyright © WireMock.Net
+
+using WireMock.Constants;
+
+namespace WireMock.Settings;
+
+/// <summary>
+/// WebSocket-specific settings
+/// </summary>
+public class WebSocketSettings
+{
+    /// <summary>
+    /// Maximum number of concurrent WebSocket connections (default: 100)
+    /// </summary>
+    public int MaxConnections { get; set; } = 100;
+
+    /// <summary>
+    /// Default keep-alive interval (default: 30 seconds)
+    /// </summary>
+    public int KeepAliveIntervalSeconds { get; set; } = WebSocketConstants.DefaultKeepAliveIntervalSeconds;
+}

src/WireMock.Net.Shared/Settings/WireMockServerSettings.cs

@@ -1,25 +1,20 @@
 // Copyright © WireMock.Net
 
-using System;
-using System.Collections.Generic;
+using System.Globalization;
 using System.Text.RegularExpressions;
 using HandlebarsDotNet;
 using JetBrains.Annotations;
+using JsonConverter.Abstractions;
+using JsonConverter.Newtonsoft.Json;
+using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
 using WireMock.Admin.Mappings;
 using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
+using WireMock.Models;
 using WireMock.RegularExpressions;
 using WireMock.Types;
-using System.Globalization;
-using WireMock.Models;
-using JsonConverter.Abstractions;
-using JsonConverter.Newtonsoft.Json;
-
-#if USE_ASPNETCORE
-using Microsoft.Extensions.DependencyInjection;
-#endif
 
 namespace WireMock.Settings;
 
@@ -153,7 +148,6 @@ public class WireMockServerSettings
     [JsonIgnore]
     public Action<object>? PostWireMockMiddlewareInit { get; set; }
 
-#if USE_ASPNETCORE
     /// <summary>
     /// Action which is called with IServiceCollection when ASP.NET Core DI is being configured. [Optional]
     /// </summary>
@@ -166,7 +160,6 @@ public class WireMockServerSettings
     /// </summary>
     [PublicAPI]
     public CorsPolicyOptions? CorsPolicyOptions { get; set; }
-#endif
 
     /// <summary>
     /// The IWireMockLogger which logs Debug, Info, Warning or Error
@@ -251,7 +244,6 @@ public class WireMockServerSettings
     [PublicAPI]
     public bool CustomCertificateDefined => CertificateSettings?.IsDefined == true;
 
-#if USE_ASPNETCORE
     /// <summary>
     /// Client certificate mode for the server
     /// </summary>
@@ -262,8 +254,7 @@ public class WireMockServerSettings
     /// Whether to accept any client certificate
     /// </summary>
     public bool AcceptAnyClientCertificate { get; set; }
-#endif
-
+    
     /// <summary>
     /// Defines the global IWebhookSettings to use.
     /// </summary>
@@ -361,4 +352,10 @@ public class WireMockServerSettings
     /// </remarks>
     [PublicAPI]
     public IJsonConverter DefaultJsonSerializer { get; set; } = new NewtonsoftJsonConverter();
+
+    /// <summary>
+    /// WebSocket settings.
+    /// </summary>
+    [PublicAPI]
+    public WebSocketSettings? WebSocketSettings { get; set; }
 }