nuget

Author: StefH

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.55</VersionPrefix>
+        <Version>1.5.55</Version>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

PackageReleaseNotes.txt

@@ -1,4 +1,2 @@
-# 1.5.55 (22 May 2024)
-- #1107 When only Port is provided, bind to * (Fixes #1100) [bug]
-
-The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md
+# 0.0.1-preview-01
+preview...

resources/WireMock.Net-LogoAspire.ico

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
+        <Version>0.0.1-preview-01</Version>
         <Description>Aspire extension to start a WireMock.Net server to stub an api.</Description>
         <AssemblyTitle>WireMock.Net.Aspire</AssemblyTitle>
         <Authors>Stef Heyenrath</Authors>
-        <TargetFramework>net8</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <!--<NoWarn>$(NoWarn);1591;8603</NoWarn>-->
         <AssemblyName>WireMock.Net.Aspire</AssemblyName>
         <PackageId>WireMock.Net.Aspire</PackageId>
         <PackageTags>dotnet;aspire;wiremock;extension</PackageTags>
@@ -21,8 +21,15 @@
         <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
         <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <PackageIcon>WireMock.Net-LogoAspire.png</PackageIcon>
+        <ApplicationIcon>../../resources/WireMock.Net-LogoAspire.ico</ApplicationIcon>
     </PropertyGroup>
 
+    <ItemGroup>
+        <None Remove="../../resources/WireMock.Net-Logo.png" />
+        <None Include="../../resources/WireMock.Net-LogoAspire.png" Pack="true" PackagePath="" />
+    </ItemGroup>
+
     <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     </PropertyGroup>

resources/WireMock.Net-LogoAspire.png

@@ -82,6 +82,12 @@ public string[] GetArgs()
         return args.ToArray();
     }
 
+    private static void AddAlways(ICollection<string> args, string argument, string value)
+    {
+        args.Add(argument);
+        args.Add(value);
+    }
+
     private static void AddIfNotNull(ICollection<string> args, string argument, string? value)
     {
         if (value is not null)
@@ -91,12 +97,6 @@ private static void AddIfNotNull(ICollection<string> args, string argument, stri
         }
     }
 
-    private static void AddAlways(ICollection<string> args, string argument, string value)
-    {
-        args.Add(argument);
-        args.Add(value);
-    }
-
     private static void AddIfTrue(ICollection<string> args, string argument, bool value)
     {
         if (value)

src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj

@@ -1,3 +1,4 @@
+using System;
 using Aspire.Hosting.ApplicationModel;
 using Stef.Validation;
 
@@ -11,7 +12,7 @@ public static class WireMockServerBuilderExtensions
 {
     private const int ContainerPort = 80;
 
-    // https://github.com/dotnet/aspire/issues/854
+    // Linux only (https://github.com/dotnet/aspire/issues/854)
     private const string DefaultLinuxImage = "sheyenrath/wiremock.net";
     private const string DefaultLinuxMappingsPath = "/app/__admin/mappings";
 
@@ -28,12 +29,10 @@ public static IResourceBuilder<WireMockServerResource> AddWireMock(this IDistrib
         Guard.NotNullOrWhiteSpace(name);
         Guard.Condition(port, p => p > 0);
 
-        var arguments = new WireMockServerArguments
+        return builder.AddWireMock(name, callback =>
         {
-            Port = port
-        };
-
-        return builder.AddWireMock(name, arguments);
+            callback.Port = port;
+        });
     }
 
     /// <summary>
@@ -71,6 +70,25 @@ public static IResourceBuilder<WireMockServerResource> AddWireMock(this IDistrib
         return resource;
     }
 
+    /// <summary>
+    /// Adds a WireMock.Net Server resource to the application model.
+    /// </summary>
+    /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
+    /// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
+    /// <param name="callback">A callback that allows for setting the <see cref="WireMockServerArguments"/>.</param>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
+    public static IResourceBuilder<WireMockServerResource> AddWireMock(this IDistributedApplicationBuilder builder, string name, Action<WireMockServerArguments> callback)
+    {
+        Guard.NotNull(builder);
+        Guard.NotNullOrWhiteSpace(name);
+        Guard.NotNull(callback);
+
+        var arguments = new WireMockServerArguments();
+        callback(arguments);
+
+        return builder.AddWireMock(name, arguments);
+    }
+
     /// <summary>
     /// Defines if the static mappings should be read at startup.
     ///