From 0d8b3b14387731cdd1f93d56e66c8b13f0c9f0da Mon Sep 17 00:00:00 2001 From: Stef Heyenrath Date: Sat, 30 Apr 2022 16:20:53 +0200 Subject: [PATCH] Update NuGets packages (#751) * . * re * . * fb * . --- .../WireMock.Net.Client.csproj | 2 +- .../WireMock.Net.Console.NETCoreApp2.csproj | 2 +- ...WireMock.Net.Console.Net452.Classic.csproj | 8 +- .../packages.config | 4 +- ...WireMock.Net.Console.Net461.Classic.csproj | 8 +- .../packages.config | 4 +- .../App.config | 24 +++- ...WireMock.Net.Console.Net472.Classic.csproj | 92 +++++++++++---- .../packages.config | 83 ++++++++++++-- .../WireMock.Net.Service.csproj | 8 +- examples/WireMock.Net.Service/packages.config | 4 +- .../WireMock.Net.StandAlone.NETCoreApp.csproj | 2 +- .../WireMock.Net.StandAlone.Net452.csproj | 4 +- .../packages.config | 2 +- .../WireMock.Net.StandAlone.Net461.csproj | 11 +- .../packages.config | 5 +- .../WireMock.Net.Abstractions.csproj | 4 +- .../WireMock.Net.FluentAssertions.csproj | 4 +- .../WireMock.Net.Matchers.CSharpCode.csproj | 4 +- .../WireMock.Net.OpenApiParser.csproj | 6 +- .../WireMock.Net.RestClient.csproj | 2 +- src/WireMock.Net.StandAlone/StandAloneApp.cs | 108 +++++++++--------- .../WireMock.Net.StandAlone.csproj | 8 +- src/WireMock.Net/WireMock.Net.csproj | 22 ++-- .../WireMock.Org.Abstractions.csproj | 2 +- .../WireMock.Org.RestClient.csproj | 4 +- .../WireMock.Net.Tests.csproj | 8 +- 27 files changed, 280 insertions(+), 155 deletions(-) diff --git a/examples/WireMock.Net.Client/WireMock.Net.Client.csproj b/examples/WireMock.Net.Client/WireMock.Net.Client.csproj index 11bef4170..172526bcf 100644 --- a/examples/WireMock.Net.Client/WireMock.Net.Client.csproj +++ b/examples/WireMock.Net.Client/WireMock.Net.Client.csproj @@ -8,7 +8,7 @@ - + diff --git a/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj b/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj index f00308176..1c25aad28 100644 --- a/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj +++ b/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj @@ -37,7 +37,7 @@ - + diff --git a/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj b/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj index 839224d24..5e8d72e83 100644 --- a/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj +++ b/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj @@ -42,11 +42,11 @@ ..\..\packages\Handlebars.Net.2.1.2\lib\net452\Handlebars.dll - - ..\..\packages\Handlebars.Net.Helpers.2.3.4\lib\net452\Handlebars.Net.Helpers.dll + + ..\..\packages\Handlebars.Net.Helpers.2.3.5\lib\net452\Handlebars.Net.Helpers.dll - - ..\..\packages\Handlebars.Net.Helpers.Core.2.3.4\lib\net452\HandlebarsDotNet.Helpers.Core.dll + + ..\..\packages\Handlebars.Net.Helpers.Core.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Core.dll ..\..\packages\log4net.2.0.14\lib\net45\log4net.dll diff --git a/examples/WireMock.Net.Console.Net452.Classic/packages.config b/examples/WireMock.Net.Console.Net452.Classic/packages.config index 885136b4f..9bc879b47 100644 --- a/examples/WireMock.Net.Console.Net452.Classic/packages.config +++ b/examples/WireMock.Net.Console.Net452.Classic/packages.config @@ -2,8 +2,8 @@ - - + + diff --git a/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj b/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj index 4476f3768..4329c7fc6 100644 --- a/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj +++ b/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj @@ -41,11 +41,11 @@ ..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll - - ..\..\packages\Handlebars.Net.Helpers.2.3.4\lib\net452\Handlebars.Net.Helpers.dll + + ..\..\packages\Handlebars.Net.Helpers.2.3.5\lib\net452\Handlebars.Net.Helpers.dll - - ..\..\packages\Handlebars.Net.Helpers.Core.2.3.4\lib\net452\HandlebarsDotNet.Helpers.Core.dll + + ..\..\packages\Handlebars.Net.Helpers.Core.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Core.dll ..\..\packages\log4net.2.0.14\lib\net45\log4net.dll diff --git a/examples/WireMock.Net.Console.Net461.Classic/packages.config b/examples/WireMock.Net.Console.Net461.Classic/packages.config index dbb575664..80596ae80 100644 --- a/examples/WireMock.Net.Console.Net461.Classic/packages.config +++ b/examples/WireMock.Net.Console.Net461.Classic/packages.config @@ -2,8 +2,8 @@ - - + + diff --git a/examples/WireMock.Net.Console.Net472.Classic/App.config b/examples/WireMock.Net.Console.Net472.Classic/App.config index 34c6195fc..c9a52ea30 100644 --- a/examples/WireMock.Net.Console.Net472.Classic/App.config +++ b/examples/WireMock.Net.Console.Net472.Classic/App.config @@ -51,11 +51,31 @@ - + - + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj b/examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj index 2ebfaf015..09b01537d 100644 --- a/examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj +++ b/examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj @@ -45,20 +45,41 @@ ..\..\packages\Fare.2.2.0\lib\net35\Fare.dll - - ..\..\packages\Handlebars.Net.2.1.0\lib\net46\Handlebars.dll + + ..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll - - ..\..\packages\Handlebars.Net.Helpers.2.3.2\lib\net452\Handlebars.Net.Helpers.dll + + ..\..\packages\Handlebars.Net.Helpers.2.3.5\lib\net452\Handlebars.Net.Helpers.dll - - ..\..\packages\Handlebars.Net.Helpers.Core.2.3.3\lib\net452\HandlebarsDotNet.Helpers.Core.dll + + ..\..\packages\Handlebars.Net.Helpers.Core.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Core.dll + + + ..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.3.3\lib\net452\HandlebarsDotNet.Helpers.DynamicLinq.dll + + + ..\..\packages\Handlebars.Net.Helpers.Humanizer.2.3.3\lib\net452\HandlebarsDotNet.Helpers.Humanizer.dll + + + ..\..\packages\Handlebars.Net.Helpers.Json.2.3.3\lib\net452\HandlebarsDotNet.Helpers.Json.dll + + + ..\..\packages\Handlebars.Net.Helpers.Random.2.3.3\lib\net452\HandlebarsDotNet.Helpers.Random.dll + + + ..\..\packages\Handlebars.Net.Helpers.Xeger.2.3.3\lib\net452\HandlebarsDotNet.Helpers.Xeger.dll + + + ..\..\packages\Handlebars.Net.Helpers.XPath.2.3.3\lib\net452\HandlebarsDotNet.Helpers.XPath.dll + + + ..\..\packages\Humanizer.Core.2.14.1\lib\netstandard2.0\Humanizer.dll ..\..\packages\JmesPath.Net.1.0.125\lib\net45\JmesPath.Net.dll - - ..\..\packages\log4net.2.0.13\lib\net45\log4net.dll + + ..\..\packages\log4net.2.0.14\lib\net45\log4net.dll ..\..\packages\Microsoft.AspNetCore.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.dll @@ -207,6 +228,21 @@ ..\..\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll + + ..\..\packages\Microsoft.IdentityModel.JsonWebTokens.6.12.2\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll + + + ..\..\packages\Microsoft.IdentityModel.Logging.6.12.2\lib\net472\Microsoft.IdentityModel.Logging.dll + + + ..\..\packages\Microsoft.IdentityModel.Protocols.6.12.2\lib\net472\Microsoft.IdentityModel.Protocols.dll + + + ..\..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.6.12.2\lib\net472\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll + + + ..\..\packages\Microsoft.IdentityModel.Tokens.6.12.2\lib\net472\Microsoft.IdentityModel.Tokens.dll + ..\..\packages\Microsoft.Net.Http.Headers.2.2.0\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll @@ -222,6 +258,9 @@ ..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll + + ..\..\packages\Stef.Validation.0.1.0\lib\net40\Stef.Validation.dll + ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -238,6 +277,9 @@ ..\..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\..\packages\System.IdentityModel.Tokens.Jwt.6.12.2\lib\net472\System.IdentityModel.Tokens.Jwt.dll + ..\..\packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll @@ -264,8 +306,8 @@ ..\..\packages\System.Security.Principal.Windows.4.5.0\lib\net461\System.Security.Principal.Windows.dll - - ..\..\packages\System.Text.Encodings.Web.4.5.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + ..\..\packages\System.Text.Encodings.Web.4.7.2\lib\net461\System.Text.Encodings.Web.dll ..\..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll @@ -280,11 +322,23 @@ - - ..\..\packages\XPath2.1.1.0\lib\net40\XPath2.dll + + ..\..\packages\TinyMapper.3.0.3\lib\net40\TinyMapper.dll + + + ..\..\packages\WireMock.Net.1.4.41\lib\net461\WireMock.Net.dll - - ..\..\packages\XPath2.Extensions.1.1.0\lib\net40\XPath2.Extensions.dll + + ..\..\packages\WireMock.Net.Abstractions.1.4.41\lib\net451\WireMock.Net.Abstractions.dll + + + ..\..\packages\WireMock.Org.Abstractions.1.4.41\lib\net45\WireMock.Org.Abstractions.dll + + + ..\..\packages\XPath2.1.1.3\lib\net452\XPath2.dll + + + ..\..\packages\XPath2.Extensions.1.1.3\lib\net452\XPath2.Extensions.dll @@ -306,16 +360,6 @@ - - - {b6269aac-170a-4346-8b9a-579ded3d9a94} - WireMock.Net.Abstractions - - - {d3804228-91f4-4502-9595-39584e5a01ad} - WireMock.Net - - diff --git a/examples/WireMock.Net.Console.Net472.Classic/packages.config b/examples/WireMock.Net.Console.Net472.Classic/packages.config index df7a1a56c..01a619d69 100644 --- a/examples/WireMock.Net.Console.Net472.Classic/packages.config +++ b/examples/WireMock.Net.Console.Net472.Classic/packages.config @@ -2,11 +2,67 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -57,15 +113,22 @@ + + + + + + + @@ -74,11 +137,13 @@ - + - - - - + + + + + + \ No newline at end of file diff --git a/examples/WireMock.Net.Service/WireMock.Net.Service.csproj b/examples/WireMock.Net.Service/WireMock.Net.Service.csproj index b376f9b19..3b135fc19 100644 --- a/examples/WireMock.Net.Service/WireMock.Net.Service.csproj +++ b/examples/WireMock.Net.Service/WireMock.Net.Service.csproj @@ -32,8 +32,8 @@ 4 - - ..\..\packages\log4net.2.0.13\lib\net45\log4net.dll + + ..\..\packages\log4net.2.0.14\lib\net45\log4net.dll ..\..\packages\Microsoft.Owin.2.0.2\lib\net45\Microsoft.Owin.dll @@ -78,8 +78,8 @@ - - ..\..\packages\XPath2.1.1.0\lib\net40\XPath2.dll + + ..\..\packages\XPath2.1.1.3\lib\net452\XPath2.dll diff --git a/examples/WireMock.Net.Service/packages.config b/examples/WireMock.Net.Service/packages.config index a46db3b40..1dae15264 100644 --- a/examples/WireMock.Net.Service/packages.config +++ b/examples/WireMock.Net.Service/packages.config @@ -1,6 +1,6 @@  - + @@ -12,5 +12,5 @@ - + \ No newline at end of file diff --git a/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj b/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj index 14aafc3dd..d7da486f3 100644 --- a/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj +++ b/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj b/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj index 39ef04d55..32da0c7de 100644 --- a/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj +++ b/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj @@ -39,8 +39,8 @@ WireMock.Net.StandAlone.Net452.Program - - ..\..\packages\log4net.2.0.13\lib\net45\log4net.dll + + ..\..\packages\log4net.2.0.14\lib\net45\log4net.dll ..\..\packages\Microsoft.Owin.Host.HttpListener.4.0.0\lib\net451\Microsoft.Owin.Host.HttpListener.dll diff --git a/examples/WireMock.Net.StandAlone.Net452/packages.config b/examples/WireMock.Net.StandAlone.Net452/packages.config index d54d4cdbd..310523019 100644 --- a/examples/WireMock.Net.StandAlone.Net452/packages.config +++ b/examples/WireMock.Net.StandAlone.Net452/packages.config @@ -1,6 +1,6 @@  - + diff --git a/examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj b/examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj index a60784a26..821c04c77 100644 --- a/examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj +++ b/examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj @@ -39,8 +39,8 @@ WireMock.Net.StandAlone.Net461.Program - - ..\..\packages\Handlebars.Net.1.9.5\lib\net452\Handlebars.dll + + ..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll ..\..\packages\Microsoft.AspNetCore.2.1.4\lib\netstandard2.0\Microsoft.AspNetCore.dll @@ -271,6 +271,9 @@ ..\..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + ..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + ..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.4\lib\net45\System.Web.Http.dll @@ -280,8 +283,8 @@ - - ..\..\packages\XPath2.1.1.0\lib\net40\XPath2.dll + + ..\..\packages\XPath2.1.1.3\lib\net452\XPath2.dll diff --git a/examples/WireMock.Net.StandAlone.Net461/packages.config b/examples/WireMock.Net.StandAlone.Net461/packages.config index 6a39f7f4a..f1b084416 100644 --- a/examples/WireMock.Net.StandAlone.Net461/packages.config +++ b/examples/WireMock.Net.StandAlone.Net461/packages.config @@ -1,6 +1,6 @@  - + @@ -78,5 +78,6 @@ - + + \ No newline at end of file diff --git a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj index e45c93737..e5f92a873 100644 --- a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj +++ b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj @@ -31,11 +31,11 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj b/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj index 1e917f4aa..15e688221 100644 --- a/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj +++ b/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj b/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj index 6920efa63..27f7ad7df 100644 --- a/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj +++ b/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj @@ -31,7 +31,7 @@ - + @@ -46,7 +46,7 @@ - + \ No newline at end of file diff --git a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj index d97127762..f497536d6 100644 --- a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj +++ b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj @@ -23,9 +23,9 @@ - - - + + + diff --git a/src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj b/src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj index 68c578631..fff55ebea 100644 --- a/src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj +++ b/src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/WireMock.Net.StandAlone/StandAloneApp.cs b/src/WireMock.Net.StandAlone/StandAloneApp.cs index 3cc5b05a0..07ab2c40e 100644 --- a/src/WireMock.Net.StandAlone/StandAloneApp.cs +++ b/src/WireMock.Net.StandAlone/StandAloneApp.cs @@ -1,80 +1,78 @@ +using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Reflection; using JetBrains.Annotations; +using Stef.Validation; +using WireMock.Exceptions; using WireMock.Logging; using WireMock.Server; using WireMock.Settings; -using Stef.Validation; -namespace WireMock.Net.StandAlone +namespace WireMock.Net.StandAlone; + +/// +/// The StandAloneApp +/// +public static class StandAloneApp { + private static readonly string Version = typeof(StandAloneApp).GetTypeInfo().Assembly.GetName().Version.ToString(); + /// - /// The StandAloneApp + /// Start WireMock.Net standalone Server based on the WireMockServerSettings. /// - public static class StandAloneApp + /// The WireMockServerSettings + [PublicAPI] + public static WireMockServer Start(WireMockServerSettings settings) { - private static readonly string Version = typeof(StandAloneApp).GetTypeInfo().Assembly.GetName().Version.ToString(); + Guard.NotNull(settings, nameof(settings)); - /// - /// Start WireMock.Net standalone Server based on the WireMockServerSettings. - /// - /// The WireMockServerSettings - [PublicAPI] - public static WireMockServer Start([NotNull] WireMockServerSettings settings) - { - Guard.NotNull(settings, nameof(settings)); + var server = WireMockServer.Start(settings); - var server = WireMockServer.Start(settings); + settings.Logger?.Info("Version [{0}]", Version); + settings.Logger?.Info("Server listening at {0}", string.Join(",", server.Urls)); - settings.Logger?.Info("Version [{0}]", Version); - settings.Logger?.Info("Server listening at {0}", string.Join(",", server.Urls)); + return server; + } - return server; - } + /// + /// Start WireMock.Net standalone Server based on the commandline arguments. + /// + /// The commandline arguments + /// The logger + [PublicAPI] + public static WireMockServer Start(string[] args, IWireMockLogger? logger = null) + { + Guard.NotNull(args, nameof(args)); - /// - /// Start WireMock.Net standalone Server based on the commandline arguments. - /// - /// The commandline arguments - /// The logger - [PublicAPI] - public static WireMockServer Start([NotNull] string[] args, [CanBeNull] IWireMockLogger logger = null) + if (TryStart(args, out var server, logger)) { - Guard.NotNull(args, nameof(args)); - - if (WireMockServerSettingsParser.TryParseArguments(args, out var settings, logger)) - { - settings.Logger?.Info("Version [{0}]", Version); - settings.Logger?.Debug("Server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'"))); - - return Start(settings); - } - - return null; + return server; } - /// - /// Try to start WireMock.Net standalone Server based on the commandline arguments. - /// - /// The commandline arguments - /// The logger - /// The WireMockServer - [PublicAPI] - public static bool TryStart([NotNull] string[] args, out WireMockServer server, [CanBeNull] IWireMockLogger logger = null) - { - Guard.NotNull(args, nameof(args)); + throw new WireMockException($"Unable start start {nameof(WireMockServer)}."); + } - if (WireMockServerSettingsParser.TryParseArguments(args, out var settings, logger)) - { - settings.Logger?.Info("Version [{0}]", Version); - settings.Logger?.Debug("Server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'"))); + /// + /// Try to start WireMock.Net standalone Server based on the commandline arguments. + /// + /// The commandline arguments + /// The logger + /// The WireMockServer + [PublicAPI] + public static bool TryStart(string[] args, [NotNullWhen(true)] out WireMockServer? server, IWireMockLogger? logger = null) + { + Guard.NotNull(args, nameof(args)); - server = Start(settings); - return true; - } + if (WireMockServerSettingsParser.TryParseArguments(args, out var settings, logger)) + { + settings.Logger?.Info("Version [{0}]", Version); + settings.Logger?.Debug("Server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'"))); - server = null; - return false; + server = Start(settings); + return true; } + + server = null; + return false; } } \ No newline at end of file diff --git a/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj b/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj index 6513ba10f..79b4208cd 100644 --- a/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj +++ b/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj @@ -36,12 +36,8 @@ - - - - all - runtime; build; native; contentfiles; analyzers - + + diff --git a/src/WireMock.Net/WireMock.Net.csproj b/src/WireMock.Net/WireMock.Net.csproj index f8c600909..29a93bd6b 100644 --- a/src/WireMock.Net/WireMock.Net.csproj +++ b/src/WireMock.Net/WireMock.Net.csproj @@ -56,17 +56,16 @@ - + - + - @@ -77,7 +76,7 @@ - + @@ -88,7 +87,6 @@ - @@ -147,13 +145,13 @@ - - - - - - - + + + + + + + diff --git a/src/WireMock.Org.Abstractions/WireMock.Org.Abstractions.csproj b/src/WireMock.Org.Abstractions/WireMock.Org.Abstractions.csproj index b508dae33..fcf5e5706 100644 --- a/src/WireMock.Org.Abstractions/WireMock.Org.Abstractions.csproj +++ b/src/WireMock.Org.Abstractions/WireMock.Org.Abstractions.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/WireMock.Org.RestClient/WireMock.Org.RestClient.csproj b/src/WireMock.Org.RestClient/WireMock.Org.RestClient.csproj index 3c1bf488d..80c5df43a 100644 --- a/src/WireMock.Org.RestClient/WireMock.Org.RestClient.csproj +++ b/src/WireMock.Org.RestClient/WireMock.Org.RestClient.csproj @@ -30,8 +30,8 @@ - - + + diff --git a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj index be5aa0fcd..82729577d 100644 --- a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj +++ b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj @@ -49,13 +49,13 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + - +