1.6.6

WireMock-Net · Oct 1, 2024 · eb7e6c3 · eb7e6c3
1 parent f56ecf9
commit eb7e6c3
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.6.6 (01 October 2024)
+- [#1185](https://github.com/WireMock-Net/WireMock.Net/pull/1185) - Throw exception in case WithTransformer is used after WithBodyFromFile [bug] contributed by [StefH](https://github.com/StefH)
+- [#1187](https://github.com/WireMock-Net/WireMock.Net/pull/1187) - Fix StaticMappingsPath in WireMockContainerBuilder [bug] contributed by [StefH](https://github.com/StefH)
+- [#1184](https://github.com/WireMock-Net/WireMock.Net/issues/1184) - .WithBodyFromFile() + .WithTransformer(transformContentFromBodyAsFile: true) = empty string [bug]
+- [#1186](https://github.com/WireMock-Net/WireMock.Net/issues/1186) - WithMappings path is null on Build() call [bug]
+
 # 1.6.5 (28 September 2024)
 - [#1175](https://github.com/WireMock-Net/WireMock.Net/pull/1175) - Add WireMock.Net.AspNetCore.Middleware [feature] contributed by [StefH](https://github.com/StefH)
 - [#1181](https://github.com/WireMock-Net/WireMock.Net/pull/1181) - WireMock.Net.Testcontainers: Use 'sheyenrath/wiremock.net-alpine' image as default for Linux [feature] contributed by [StefH](https://github.com/StefH)

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.6.5</VersionPrefix>
+        <VersionPrefix>1.6.6</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

diff --git a/Generate-ReleaseNotes.cmd b/Generate-ReleaseNotes.cmd
@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=1.6.5
+SET version=1.6.6
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels test question invalid doc duplicate example environment --version %version% --token %GH_TOKEN%
 

diff --git a/PackageReleaseNotes.txt b/PackageReleaseNotes.txt
@@ -1,6 +1,7 @@
-# 1.6.5 (28 September 2024)
-- #1175 Add WireMock.Net.AspNetCore.Middleware [feature]
-- #1181 WireMock.Net.Testcontainers: Use 'sheyenrath/wiremock.net-alpine' image as default for Linux [feature]
-- #1182 pass in the request when no matching is found to the warn logger [feature]
+# 1.6.6 (01 October 2024)
+- #1185 Throw exception in case WithTransformer is used after WithBodyFromFile [bug]
+- #1187 Fix StaticMappingsPath in WireMockContainerBuilder [bug]
+- #1184 .WithBodyFromFile() + .WithTransformer(transformContentFromBodyAsFile: true) = empty string [bug]
+- #1186 WithMappings path is null on Build() call [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md
diff --git a/examples/WireMock.Net.TestcontainersExample/Program.cs b/examples/WireMock.Net.TestcontainersExample/Program.cs
@@ -16,7 +16,7 @@ private static async Task Main(string[] args)
         {
             Console.ForegroundColor = ConsoleColor.Yellow;
             Console.WriteLine("Linux");
-            await TestAsync("sheyenrath/wiremock.net:1.6.4");
+            await TestAsync("sheyenrath/wiremock.net:1.6.5");
             await Task.Delay(1_000);
         }
         catch (Exception e)
@@ -32,7 +32,7 @@ private static async Task Main(string[] args)
         {
             Console.ForegroundColor = ConsoleColor.White;
             Console.WriteLine("Linux Alpine");
-            await TestAsync("sheyenrath/wiremock.net-alpine:1.6.4");
+            await TestAsync("sheyenrath/wiremock.net-alpine:1.6.5");
             await Task.Delay(1_000);
         }
         catch (Exception e)
@@ -64,7 +64,7 @@ private static async Task Main(string[] args)
         {
             Console.ForegroundColor = ConsoleColor.Cyan;
             Console.WriteLine("Windows");
-            await TestAsync("sheyenrath/wiremock.net-windows:1.6.4");
+            await TestAsync("sheyenrath/wiremock.net-windows:1.6.5");
             await Task.Delay(1_000);
         }
         catch (Exception e)
@@ -106,21 +106,15 @@ private static async Task Main(string[] args)
 
     private static async Task TestAsync(string? image = null)
     {
+        var mappingsPath = Path.Combine(Directory.GetCurrentDirectory(), "..", "..", "..", "..", "WireMock.Net.Console.NET6", "__admin", "mappings");
+
         var builder = new WireMockContainerBuilder()
             .WithAdminUserNameAndPassword("x", "y")
+            .WithMappings(mappingsPath)
             .WithWatchStaticMappings(true)
             .WithAutoRemove(true)
             .WithCleanUp(true);
 
-        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-        {
-            builder = builder.WithMappings(@"C:\Dev\GitHub\WireMock.Net\examples\WireMock.Net.Console.NET6\__admin\mappings");
-        }
-        else
-        {
-            builder = builder.WithMappings("/workspaces/WireMock.Net/examples/WireMock.Net.Console.NET6/__admin/mappings");
-        }
-
         if (image != null)
         {
             builder = image switch