diff --git a/CHANGELOG.md b/CHANGELOG.md index 14dc5e1e..ec8a8515 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# 1.19.0 (12 December 2025) +- [#1391](https://github.com/wiremock/WireMock.Net/pull/1391) - Update WireMockContainerBuilder (WithImage and WithCustomImage) [feature] contributed by [StefH](https://github.com/StefH) +- [#1392](https://github.com/wiremock/WireMock.Net/pull/1392) - WireMockContainerBuilder: allow all docker images named wiremock [feature] contributed by [StefH](https://github.com/StefH) +- [#1390](https://github.com/wiremock/WireMock.Net/issues/1390) - Unable to build WireMockContainerBuilder with custom image [feature] + +# 1.18.0 (09 December 2025) +- [#1388](https://github.com/wiremock/WireMock.Net/pull/1388) - Add WithBodyAsType to RequestMatcher [feature] contributed by [StefH](https://github.com/StefH) + # 1.17.0 (07 December 2025) - [#1383](https://github.com/wiremock/WireMock.Net/pull/1383) - Aspire: Add WithProtoDefinition to support proto definition at server level [feature] contributed by [StefH](https://github.com/StefH) - [#1386](https://github.com/wiremock/WireMock.Net/pull/1386) - Fix random delay in mapping json file [bug] contributed by [StefH](https://github.com/StefH) diff --git a/Directory.Build.props b/Directory.Build.props index 7fdbf70b..6d59e440 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ - 1.17.0 + 1.19.0 WireMock.Net-Logo.png https://github.com/wiremock/WireMock.Net Apache-2.0 diff --git a/Generate-ReleaseNotes.cmd b/Generate-ReleaseNotes.cmd index 23ba6396..dee29e49 100644 --- a/Generate-ReleaseNotes.cmd +++ b/Generate-ReleaseNotes.cmd @@ -1,6 +1,6 @@ rem https://github.com/StefH/GitHubReleaseNotes -SET version=1.17.0 +SET version=1.19.0 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels wontfix test question invalid doc duplicate example environment --version %version% --token %GH_TOKEN% diff --git a/PackageReleaseNotes.txt b/PackageReleaseNotes.txt index 2329f0e3..1cc929a6 100644 --- a/PackageReleaseNotes.txt +++ b/PackageReleaseNotes.txt @@ -1,11 +1,6 @@ -# 1.17.0 (07 December 2025) -- #1383 Aspire: Add WithProtoDefinition to support proto definition at server level [feature] -- #1386 Fix random delay in mapping json file [bug] -- #812 Wiki page for using WireMock.Net with appium for mobile automation testing [wontfix] -- #1274 .WithMappings to mount volume is not working for GRPC [bug] -- #1381 Downstream dependencies missing after 1.16.0 release [bug] -- #1382 Does Aspire support enabling HTTP/2? [feature] -- #1385 Do delays and probabilities show in saved static mappings? [bug] -- #1387 Tests failing with TaskCanceledException on Windows Server 2025 Build 7171 [bug] +# 1.19.0 (12 December 2025) +- #1391 Update WireMockContainerBuilder (WithImage and WithCustomImage) [feature] +- #1392 WireMockContainerBuilder: allow all docker images named wiremock [feature] +- #1390 Unable to build WireMockContainerBuilder with custom image [feature] The full release notes can be found here: https://github.com/wiremock/WireMock.Net/blob/master/CHANGELOG.md \ No newline at end of file diff --git a/README.md b/README.md index 0c189177..0b3b73dd 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) w |   **Issues** | [![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/wiremock/WireMock.Net/issues) | | | | | ***Quality*** |   | -|   **Build Azure** | [![Build Status Azure](https://stef.visualstudio.com/WireMock.Net/_apis/build/status/WireMock.Net)](https://stef.visualstudio.com/WireMock.Net/_build/latest?definitionId=7) | +|   **Build Azure** | [![Build Status Azure](https://stef.visualstudio.com/WireMock.Net/_apis/build/status/WireMock.Net)](https://stef.visualstudio.com/WireMock.Net/_build/latest?definitionId=61) | |   **Quality** | [![Sonar Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=alert_status)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net) [![CodeFactor](https://www.codefactor.io/repository/github/wiremock/wiremock.net/badge)](https://www.codefactor.io/repository/github/wiremock/wiremock.net) | |   **Sonar Bugs** | [![Sonar Bugs](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=bugs)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=BUG) [![Sonar Code Smells](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=code_smells)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=CODE_SMELL) | |   **Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=coverage)](https://sonarcloud.io/component_measures?id=WireMock-Net_WireMock.Net&metric=coverage) [![codecov](https://codecov.io/gh/wiremock/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/wiremock/WireMock.Net)| diff --git a/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs b/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs index 16cf55dd..71c0ad69 100644 --- a/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs +++ b/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs @@ -62,6 +62,29 @@ public sealed class WireMockContainerBuilder : ContainerBuilder + /// Sets a custom WireMock.Net image for which to create the container. + /// + /// The image name. + /// A configured instance of + [PublicAPI] + public new WireMockContainerBuilder WithImage(string image) + { + return WithCustomImage(image); + } + + /// + /// Sets a custom WireMock.Net image for which to create the container. + /// + /// The image name. + /// A configured instance of + [PublicAPI] + public WireMockContainerBuilder WithCustomImage(string image) + { + _imageOS ??= TestcontainersUtils.GetImageOSAsync.Value.GetAwaiter().GetResult(); + return base.WithImage(image); + } + /// /// Set the admin username and password for the container (basic authentication). /// @@ -207,9 +230,9 @@ public sealed class WireMockContainerBuilder : ContainerBuilder= 0 ? OSPlatform.Windows : OSPlatform.Linux; diff --git a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs index cb1be050..f3e19893 100644 --- a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs +++ b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs @@ -92,7 +92,7 @@ public partial class TestcontainersTests(ITestOutputHelper testOutputHelper) } else { - wireMockContainerBuilder = wireMockContainerBuilder.WithImage("sheyenrath/wiremock.net"); + wireMockContainerBuilder = wireMockContainerBuilder.WithImage("sheyenrath/wiremock.net-alpine"); } var wireMockContainer = wireMockContainerBuilder.Build();