Merge branch 'master' into stef-849

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.5.11 (24 November 2022)
+- [#836](https://github.com/WireMock-Net/WireMock.Net/pull/836) - Add Settings.QueryParameterMultipleValueSupport [feature] contributed by [StefH](https://github.com/StefH)
+- [#848](https://github.com/WireMock-Net/WireMock.Net/pull/848) - Use try-catch when adding or removing logEntry [bug] contributed by [StefH](https://github.com/StefH)
+- [#846](https://github.com/WireMock-Net/WireMock.Net/issues/846) - Exception ArgumentOutOfRangeException [bug]
+
 # 1.5.10 (06 November 2022)
 - [#843](https://github.com/WireMock-Net/WireMock.Net/pull/843) - Webhook Templating: Use the transformed URL to create the HttpRequestMessage contributed by [ggradnig](https://github.com/ggradnig)
 - [#845](https://github.com/WireMock-Net/WireMock.Net/pull/845) - Add WireMockNullLogger as valid commandline logger option [feature] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.10</VersionPrefix>
+        <VersionPrefix>1.5.11</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -20,6 +20,13 @@
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     </PropertyGroup>
 
+    <!-- https://github.com/coverlet-coverage/coverlet/issues/1391 -->
+    <PropertyGroup Condition="$(MSBuildProjectName.Contains('.Tests'))">
+        <CollectCoverage>true</CollectCoverage>
+        <ExcludeByAttribute>GeneratedCodeAttribute</ExcludeByAttribute>
+        <CoverletOutputFormat>opencover</CoverletOutputFormat>
+    </PropertyGroup>
+
     <ItemGroup>
         <None Include="../../resources/WireMock.Net-Logo.png" Pack="true" PackagePath="" />
         <!--<None Include="../../PackageReadme.md" Pack="true" PackagePath=""/>-->

Generate-ReleaseNotes.cmd

@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=1.5.10
+SET version=1.5.11
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate --version %version% --token %GH_TOKEN%
 

PackageReleaseNotes.txt

@@ -1,5 +1,6 @@
-# 1.5.10 (06 November 2022)
+# 1.5.11 (24 November 2022)
-- #843 Webhook Templating: Use the transformed URL to create the HttpRequestMessage
+- #836 Add Settings.QueryParameterMultipleValueSupport [feature]
-- #845 Add WireMockNullLogger as valid commandline logger option [feature]
+- #848 Use try-catch when adding or removing logEntry [bug]
+- #846 Exception ArgumentOutOfRangeException [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

azure-pipelines-ci.yml

@@ -43,14 +43,12 @@ jobs:
       command: 'build'
       projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
       arguments: '--configuration Debug --framework net6.0'
-  
+
-  - task: DotNetCoreCLI@2
+  - task: CmdLine@2
-    displayName: 'Execute Unit tests'
     inputs:
-      command: 'test'
+      script: 'dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --no-build --configuration Debug --framework net6.0'
-      projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
+    displayName: 'Execute Unit Tests with Coverage'
-      arguments: '--no-build --configuration Debug --framework net6.0 --collect:"XPlat Code Coverage" --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover'
+   
-  
   - task: SonarCloudAnalyze@1
     displayName: 'SonarCloud: Run Code Analysis'
     condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
@@ -76,7 +74,7 @@ jobs:
   - task: PublishBuildArtifacts@1
     displayName: Publish coverage file
     inputs:
-      PathtoPublish: '/home/vsts/work/1/s/test/WireMock.Net.Tests/coverage.net6.0.opencover.xml'
+      PathtoPublish: './test/WireMock.Net.Tests/coverage.net6.0.opencover.xml'
 
 - job: Windows_Build_Test
 

examples/WireMock.Net.Service/App.config

@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>

examples/WireMock.Net.Service/WireMock.Net.Service.csproj

@@ -8,9 +8,10 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>WireMock.Net.Service</RootNamespace>
     <AssemblyName>WireMock.Net.Service</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

examples/WireMock.Net.Service/packages.config

@@ -11,6 +11,6 @@
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
   <package id="Owin" version="1.0" targetFramework="net452" />
   <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
-  <package id="System.Net.Http" version="4.3.4" targetFramework="net452" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net452" requireReinstallation="true" />
   <package id="XPath2" version="1.1.3" targetFramework="net452" />
 </packages>

src/WireMock.Net/Owin/WireMockMiddleware.cs

@@ -269,29 +269,55 @@ namespace WireMock.Owin
         {
             _options.Logger.DebugRequestResponse(_logEntryMapper.Map(entry), entry.RequestMessage.Path.StartsWith("/__admin/"));
 
-            if (addRequest)
+            // If addRequest is set to true and MaxRequestLogCount is null or does have a value greater than 0, try to add a new request log.
+            if (addRequest && _options.MaxRequestLogCount is null or > 0)
             {
-                _options.LogEntries.Add(entry);
+                TryAddLogEntry(entry);
             }
 
-            if (_options.MaxRequestLogCount != null)
+            // In case MaxRequestLogCount has a value greater than 0, try to delete existing request logs based on the count.
+            if (_options.MaxRequestLogCount is > 0)
             {
                 var logEntries = _options.LogEntries.ToList();
                 foreach (var logEntry in logEntries.OrderBy(le => le.RequestMessage.DateTime).Take(logEntries.Count - _options.MaxRequestLogCount.Value))
                 {
-                    _options.LogEntries.Remove(logEntry);
+                    TryRemoveLogEntry(logEntry);
                 }
             }
 
-            if (_options.RequestLogExpirationDuration != null)
+            // In case RequestLogExpirationDuration has a value greater than 0, try to delete existing request logs based on the date.
+            if (_options.RequestLogExpirationDuration is > 0)
             {
                 var checkTime = DateTime.UtcNow.AddHours(-_options.RequestLogExpirationDuration.Value);
-
                 foreach (var logEntry in _options.LogEntries.ToList().Where(le => le.RequestMessage.DateTime < checkTime))
                 {
-                    _options.LogEntries.Remove(logEntry);
+                    TryRemoveLogEntry(logEntry);
                 }
             }
         }
+
+        private void TryAddLogEntry(LogEntry logEntry)
+        {
+            try
+            {
+                _options.LogEntries.Add(logEntry);
+            }
+            catch
+            {
+                // Ignore exception (can happen during stress testing)
+            }
+        }
+
+        private void TryRemoveLogEntry(LogEntry logEntry)
+        {
+            try
+            {
+                _options.LogEntries.Remove(logEntry);
+            }
+            catch
+            {
+                // Ignore exception (can happen during stress testing)
+            }
+        }
     }
 }

test/WireMock.Net.Tests/WireMock.Net.Tests.csproj

@@ -31,17 +31,17 @@
 
     <ItemGroup>
         <PackageReference Include="Codecov" Version="1.13.0" />
-        <PackageReference Include="coverlet.msbuild" Version="3.1.2">
+        <PackageReference Include="coverlet.msbuild" Version="3.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.1.2">
+        <PackageReference Include="coverlet.collector" Version="3.2.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

test/WireMock.Net.Tests/WireMockServer.Admin.cs

@@ -5,6 +5,7 @@ using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
+using FluentAssertions;
 using Moq;
 using Newtonsoft.Json;
 using NFluent;
@@ -374,6 +375,26 @@ public class WireMockServerAdminTests
         server.Stop();
     }
 
+    [Fact]
+    public async Task WireMockServer_Admin_Logging_SetMaxRequestLogCount_To_0_Should_Not_AddLogging()
+    {
+        // Assign
+        var client = new HttpClient();
+
+        // Act
+        var server = WireMockServer.Start();
+        server.SetMaxRequestLogCount(0);
+
+        await client.GetAsync("http://localhost:" + server.Port + "/foo1").ConfigureAwait(false);
+        await client.GetAsync("http://localhost:" + server.Port + "/foo2").ConfigureAwait(false);
+        await client.GetAsync("http://localhost:" + server.Port + "/foo3").ConfigureAwait(false);
+
+        // Assert
+        server.LogEntries.Should().BeEmpty();
+
+        server.Stop();
+    }
+
     [Fact]
     public void WireMockServer_Admin_WatchStaticMappings()
     {