Use new Handlebars.Net.Helpers (#581)

src/WireMock.Net/Proxy/ProxyHelper.cs

@@ -12,7 +12,8 @@ using WireMock.ResponseBuilders;
 using WireMock.Settings;
 using WireMock.Types;
 using WireMock.Util;
-
+using WireMock.Validation;
+
 namespace WireMock.Proxy
 {
     internal class ProxyHelper
@@ -21,7 +22,7 @@ namespace WireMock.Proxy
 
         public ProxyHelper([NotNull] IWireMockServerSettings settings)
         {
-            Guard.NotNull(settings, nameof(settings));
+            Check.NotNull(settings, nameof(settings));
             _settings = settings;
         }
 
@@ -31,9 +32,9 @@ namespace WireMock.Proxy
             [NotNull] RequestMessage requestMessage,
             [NotNull] string url)
         {
-            Guard.NotNull(client, nameof(client));
-            Guard.NotNull(requestMessage, nameof(requestMessage));
-            Guard.NotNull(url, nameof(url));
+            Check.NotNull(client, nameof(client));
+            Check.NotNull(requestMessage, nameof(requestMessage));
+            Check.NotNull(url, nameof(url));
 
             var originalUri = new Uri(requestMessage.Url);
             var requiredUri = new Uri(url);

src/WireMock.Net/Transformers/Handlebars/FileHelpers.cs

@@ -0,0 +1,27 @@
+using System;
+using HandlebarsDotNet;
+using HandlebarsDotNet.Helpers.Attributes;
+using HandlebarsDotNet.Helpers.Enums;
+using HandlebarsDotNet.Helpers.Helpers;
+using WireMock.Handlers;
+
+namespace WireMock.Transformers.Handlebars
+{
+    internal class FileHelpers : BaseHelpers, IHelpers
+    {
+        private readonly IFileSystemHandler _fileSystemHandler;
+
+        public FileHelpers(IHandlebars context, IFileSystemHandler fileSystemHandler) : base(context)
+        {
+            _fileSystemHandler = fileSystemHandler ?? throw new ArgumentNullException(nameof(fileSystemHandler));
+        }
+
+        [HandlebarsWriter(WriterType.String, usage: HelperUsage.Both, passContext: true, name: "File")]
+        public string Read(Context context, string path)
+        {
+            var templateFunc = Context.Compile(path);
+            string transformed = templateFunc(context.Value);
+            return _fileSystemHandler.ReadResponseBodyAsString(transformed);
+        }
+    }
+}

src/WireMock.Net/Transformers/Handlebars/HandlebarsContext.cs

@@ -1,6 +1,6 @@
 using HandlebarsDotNet;
 using WireMock.Handlers;
-
+
 namespace WireMock.Transformers.Handlebars
 {
     internal class HandlebarsContext : IHandlebarsContext
@@ -12,7 +12,6 @@ namespace WireMock.Transformers.Handlebars
         public string ParseAndRender(string text, object model)
         {
             var template = Handlebars.Compile(text);
-
             return template(model);
         }
     }

src/WireMock.Net/Transformers/Handlebars/HandlebarsContextFactory.cs

@@ -7,11 +7,6 @@ namespace WireMock.Transformers.Handlebars
 {
     internal class HandlebarsContextFactory : ITransformerContextFactory
     {
-        private static readonly HandlebarsConfiguration HandlebarsConfiguration = new HandlebarsConfiguration
-        {
-            UnresolvedBindingFormatter = "{0}"
-        };
-
         private readonly IFileSystemHandler _fileSystemHandler;
         private readonly Action<IHandlebars, IFileSystemHandler> _action;
 
@@ -23,7 +18,7 @@ namespace WireMock.Transformers.Handlebars
 
         public ITransformerContext Create()
         {
-            var handlebars = HandlebarsDotNet.Handlebars.Create(HandlebarsConfiguration);
+            var handlebars = HandlebarsDotNet.Handlebars.Create();
 
             WireMockHandlebarsHelpers.Register(handlebars, _fileSystemHandler);
 

src/WireMock.Net/Transformers/Handlebars/HandlebarsFile.cs

@@ -1,41 +0,0 @@
-using HandlebarsDotNet;
-using System;
-using WireMock.Handlers;
-using WireMock.Validation;
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class HandlebarsFile
-    {
-        public static void Register(IHandlebars handlebarsContext, IFileSystemHandler fileSystemHandler)
-        {
-            handlebarsContext.RegisterHelper("File", (writer, context, arguments) =>
-            {
-                string value = ParseArgumentAndReadFileFragment(handlebarsContext, context, fileSystemHandler, arguments);
-                writer.Write(value);
-            });
-
-            handlebarsContext.RegisterHelper("File", (writer, options, context, arguments) =>
-            {
-                string value = ParseArgumentAndReadFileFragment(handlebarsContext, context, fileSystemHandler, arguments);
-                options.Template(writer, value);
-            });
-        }
-
-        private static string ParseArgumentAndReadFileFragment(IHandlebars handlebarsContext, dynamic context, IFileSystemHandler fileSystemHandler, object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length == 1, nameof(arguments));
-            Check.NotNull(arguments[0], "arguments[0]");
-
-            switch (arguments[0])
-            {
-                case string path:
-                    var templateFunc = handlebarsContext.Compile(path);
-                    string transformed = templateFunc(context);
-                    return fileSystemHandler.ReadResponseBodyAsString(transformed);
-            }
-
-            throw new NotSupportedException($"The value '{arguments[0]}' with type '{arguments[0]?.GetType()}' cannot be used in Handlebars File.");
-        }
-    }
-}

src/WireMock.Net/Transformers/Handlebars/HandlebarsJsonPath.cs

@@ -1,79 +0,0 @@
-using HandlebarsDotNet;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections;
-using System.Linq;
-using WireMock.Util;
-using WireMock.Validation;
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class HandlebarsJsonPath
-    {
-        public static void Register(IHandlebars handlebarsContext)
-        {
-            handlebarsContext.RegisterHelper("JsonPath.SelectToken", (writer, context, arguments) =>
-            {
-                (JToken valueToProcess, string jsonPath) = ParseArguments(arguments);
-
-                try
-                {
-                    var result = valueToProcess.SelectToken(jsonPath);
-                    writer.WriteSafeString(result);
-                }
-                catch (JsonException)
-                {
-                    // Ignore JsonException
-                }
-            });
-
-            handlebarsContext.RegisterHelper("JsonPath.SelectTokens", (writer, options, context, arguments) =>
-            {
-                (JToken valueToProcess, string jsonPath) = ParseArguments(arguments);
-
-                try
-                {
-                    var values = valueToProcess.SelectTokens(jsonPath);
-                    if (values != null)
-                    {
-                        options.Template(writer, values.ToDictionary(value => value.Path, value => value));
-                    }
-                }
-                catch (JsonException)
-                {
-                    // Ignore JsonException
-                }
-            });
-        }
-
-        private static (JToken valueToProcess, string jsonpath) ParseArguments(object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length == 2, nameof(arguments));
-            Check.NotNull(arguments[0], "arguments[0]");
-            Check.NotNullOrEmpty(arguments[1] as string, "arguments[1]");
-
-            JToken valueToProcess;
-
-            switch (arguments[0])
-            {
-                case JToken tokenValue:
-                    valueToProcess = tokenValue;
-                    break;
-
-                case string stringValue:
-                    valueToProcess = JsonUtils.Parse(stringValue);
-                    break;
-
-                case IEnumerable enumerableValue:
-                    valueToProcess = JArray.FromObject(enumerableValue);
-                    break;
-
-                default:
-                    throw new NotSupportedException($"The value '{arguments[0]}' with type '{arguments[0]?.GetType()}' cannot be used in Handlebars JsonPath.");
-            }
-
-            return (valueToProcess, (string)arguments[1]);
-        }
-    }
-}

src/WireMock.Net/Transformers/Handlebars/HandlebarsLinq.cs

@@ -1,86 +0,0 @@
-using System;
-using System.Linq;
-using System.Linq.Dynamic.Core;
-using System.Linq.Dynamic.Core.Exceptions;
-using HandlebarsDotNet;
-using Newtonsoft.Json.Linq;
-using WireMock.Util;
-using WireMock.Validation;
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class HandlebarsLinq
-    {
-        public static void Register(IHandlebars handlebarsContext)
-        {
-            handlebarsContext.RegisterHelper("Linq", (writer, context, arguments) =>
-            {
-                (JToken valueToProcess, string linqStatement) = ParseArguments(arguments);
-
-                try
-                {
-                    object result = ExecuteDynamicLinq(valueToProcess, linqStatement);
-                    writer.WriteSafeString(result);
-                }
-                catch (ParseException)
-                {
-                    // Ignore ParseException
-                }
-            });
-
-            handlebarsContext.RegisterHelper("Linq", (writer, options, context, arguments) =>
-            {
-                (JToken valueToProcess, string linqStatement) = ParseArguments(arguments);
-
-                try
-                {
-                    var result = ExecuteDynamicLinq(valueToProcess, linqStatement);
-                    options.Template(writer, result);
-                }
-                catch (ParseException)
-                {
-                    // Ignore ParseException
-                }
-            });
-        }
-
-        private static dynamic ExecuteDynamicLinq(JToken value, string linqStatement)
-        {
-            // Convert a single object to a Queryable JObject-list with 1 entry.
-            var queryable1 = new[] { value }.AsQueryable();
-
-            // Generate the DynamicLinq select statement.
-            string dynamicSelect = JsonUtils.GenerateDynamicLinqStatement(value);
-
-            // Execute DynamicLinq Select statement.
-            var queryable2 = queryable1.Select(dynamicSelect);
-
-            // Execute the Select(...) method and get first result with FirstOrDefault().
-            return queryable2.Select(linqStatement).FirstOrDefault();
-        }
-
-        private static (JToken valueToProcess, string linqStatement) ParseArguments(object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length == 2, nameof(arguments));
-            Check.NotNull(arguments[0], "arguments[0]");
-            Check.NotNullOrEmpty(arguments[1] as string, "arguments[1]");
-
-            JToken valueToProcess;
-            switch (arguments[0])
-            {
-                case string jsonAsString:
-                    valueToProcess = new JValue(jsonAsString);
-                    break;
-
-                case JToken jsonAsJObject:
-                    valueToProcess = jsonAsJObject;
-                    break;
-
-                default:
-                    throw new NotSupportedException($"The value '{arguments[0]}' with type '{arguments[0]?.GetType()}' cannot be used in Handlebars Linq.");
-            }
-
-            return (valueToProcess, (string) arguments[1]);
-        }
-    }
-}

src/WireMock.Net/Transformers/Handlebars/HandlebarsRandom.cs

@@ -1,113 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using HandlebarsDotNet;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using RandomDataGenerator.FieldOptions;
-using RandomDataGenerator.Randomizers;
-using WireMock.Validation;
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class HandlebarsRandom
-    {
-        public static void Register(IHandlebars handlebarsContext)
-        {
-            handlebarsContext.RegisterHelper("Random", (writer, context, arguments) =>
-            {
-                object value = GetRandomValue(arguments);
-                writer.Write(value);
-            });
-
-            handlebarsContext.RegisterHelper("Random", (writer, options, context, arguments) =>
-            {
-                object value = GetRandomValue(arguments);
-                options.Template(writer, value);
-            });
-        }
-
-        private static object GetRandomValue(object[] arguments)
-        {
-            var fieldOptions = GetFieldOptionsFromArguments(arguments);
-            dynamic randomizer = RandomizerFactory.GetRandomizerAsDynamic(fieldOptions);
-
-            // Format DateTime as ISO 8601
-            if (fieldOptions is IFieldOptionsDateTime)
-            {
-                DateTime? date = randomizer.Generate();
-                return date?.ToString("s", CultureInfo.InvariantCulture);
-            }
-
-            // If the IFieldOptionsGuid defines Uppercase, use the 'GenerateAsString' method.
-            if (fieldOptions is IFieldOptionsGuid fieldOptionsGuid)
-            {
-                return fieldOptionsGuid.Uppercase ? randomizer.GenerateAsString() : randomizer.Generate();
-            }
-
-            return randomizer.Generate();
-        }
-
-        private static FieldOptionsAbstract GetFieldOptionsFromArguments(object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length > 0, nameof(arguments));
-            Check.NotNull(arguments[0], "arguments[0]");
-
-            var properties = (Dictionary<string, object>)arguments[0];
-            var newProperties = new Dictionary<string, object>();
-
-            foreach (KeyValuePair<string, object> property in properties.Where(p => p.Key != "Type"))
-            {
-                if (property.Value.GetType().Name == "UndefinedBindingResult")
-                {
-                    if (TryParseSpecialValue(property.Value, out object parsedValue))
-                    {
-                        newProperties.Add(property.Key, parsedValue);
-                    }
-                }
-                else
-                {
-                    newProperties.Add(property.Key, property.Value);
-                }
-            }
-
-            return FieldOptionsFactory.GetFieldOptions((string)properties["Type"], newProperties);
-        }
-
-        /// <summary>
-        /// In case it's an UndefinedBindingResult, just try to convert the value using Json
-        /// This logic adds functionality like parsing an array
-        /// </summary>
-        /// <param name="value">The property value</param>
-        /// <param name="parsedValue">The parsed value</param>
-        /// <returns>true in case parsing is ok, else false</returns>
-        private static bool TryParseSpecialValue(object value, out object parsedValue)
-        {
-            parsedValue = null;
-            string propertyValueAsString = value.ToString();
-
-            try
-            {
-                JToken jToken = JToken.Parse(propertyValueAsString);
-                switch (jToken)
-                {
-                    case JArray jTokenArray:
-                        parsedValue = jTokenArray.ToObject<string[]>().ToList(); // Just convert to a String List to enable Random StringList
-                        break;
-
-                    default:
-                        return jToken.ToObject<dynamic>();
-                }
-
-                return true;
-            }
-            catch (JsonException)
-            {
-                // Ignore and don't add this value
-            }
-
-            return false;
-        }
-    }
-}

src/WireMock.Net/Transformers/Handlebars/HandlebarsRegex.cs

@@ -1,64 +0,0 @@
-using System;
-using System.Linq;
-using System.Text.RegularExpressions;
-using HandlebarsDotNet;
-using WireMock.Util;
-using WireMock.Validation;
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class HandlebarsRegex
-    {
-        public static void Register(IHandlebars handlebarsContext)
-        {
-            handlebarsContext.RegisterHelper("Regex.Match", (writer, context, arguments) =>
-            {
-                (string stringToProcess, string regexPattern, object defaultValue) = ParseArguments(arguments);
-
-                Match match = Regex.Match(stringToProcess, regexPattern);
-
-                if (match.Success)
-                {
-                    writer.WriteSafeString(match.Value);
-                }
-                else if (defaultValue != null)
-                {
-                    writer.WriteSafeString(defaultValue);
-                }
-            });
-
-            handlebarsContext.RegisterHelper("Regex.Match", (writer, options, context, arguments) =>
-            {
-                (string stringToProcess, string regexPattern, object defaultValue) = ParseArguments(arguments);
-
-                var regex = new Regex(regexPattern);
-                var namedGroups = RegexUtils.GetNamedGroups(regex, stringToProcess);
-                if (namedGroups.Any())
-                {
-                    options.Template(writer, namedGroups);
-                }
-                else if (defaultValue != null)
-                {
-                    options.Template(writer, defaultValue);
-                }
-            });
-        }
-
-        private static (string stringToProcess, string regexPattern, object defaultValue) ParseArguments(object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length == 2 || args.Length == 3, nameof(arguments));
-
-            string ParseAsString(object arg)
-            {
-                if (arg is string argAsString)
-                {
-                    return argAsString;
-                }
-
-                throw new NotSupportedException($"The value '{arg}' with type '{arg?.GetType()}' cannot be used in Handlebars Regex.");
-            }
-
-            return (ParseAsString(arguments[0]), ParseAsString(arguments[1]), arguments.Length == 3 ? arguments[2] : null);
-        }
-    }
-}

src/WireMock.Net/Transformers/Handlebars/HandlebarsXPath.cs

@@ -1,102 +0,0 @@
-using HandlebarsDotNet;
-using System;
-using System.Text;
-using System.Xml;
-using System.Xml.XPath;
-using WireMock.Validation;
-#if !NETSTANDARD1_3
-using Wmhelp.XPath2;
-#endif
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class HandlebarsXPath
-    {
-        public static void Register(IHandlebars handlebarsContext)
-        {
-            handlebarsContext.RegisterHelper("XPath.SelectSingleNode", (writer, context, arguments) =>
-            {
-                (XPathNavigator nav, string xpath) = ParseArguments(arguments);
-
-                try
-                {
-#if NETSTANDARD1_3
-                    var result = nav.SelectSingleNode(xpath);
-#else
-                    var result = nav.XPath2SelectSingleNode(xpath);
-#endif
-                    writer.WriteSafeString(result.OuterXml);
-                }
-                catch (Exception)
-                {
-                    // Ignore Exception
-                }
-            });
-
-            handlebarsContext.RegisterHelper("XPath.SelectNodes", (writer, context, arguments) =>
-            {
-                (XPathNavigator nav, string xpath) = ParseArguments(arguments);
-
-                try
-                {
-#if NETSTANDARD1_3
-                    var result = nav.Select(xpath);
-#else
-                    var result = nav.XPath2SelectNodes(xpath);
-#endif
-                    var resultXml = new StringBuilder();
-                    foreach (XPathNavigator node in result)
-                    {
-                        resultXml.Append(node.OuterXml);
-                    }
-
-                    writer.WriteSafeString(resultXml);
-                }
-                catch (Exception)
-                {
-                    // Ignore Exception
-                }
-            });
-
-            handlebarsContext.RegisterHelper("XPath.Evaluate", (writer, context, arguments) =>
-            {
-                (XPathNavigator nav, string xpath) = ParseArguments(arguments);
-
-                try
-                {
-#if NETSTANDARD1_3
-                    var result = nav.Evaluate(xpath);
-#else
-                    var result = nav.XPath2Evaluate(xpath);
-#endif
-                    writer.WriteSafeString(result);
-                }
-                catch (Exception)
-                {
-                    // Ignore Exception
-                }
-            });
-        }
-
-        private static (XPathNavigator nav, string xpath) ParseArguments(object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length == 2, nameof(arguments));
-            Check.NotNull(arguments[0], "arguments[0]");
-            Check.NotNullOrEmpty(arguments[1] as string, "arguments[1]");
-
-            XPathNavigator nav;
-
-            switch (arguments[0])
-            {
-                case string stringValue:
-                    nav = new XmlDocument { InnerXml = stringValue }.CreateNavigator();
-                    break;
-
-                default:
-                    throw new NotSupportedException($"The value '{arguments[0]}' with type '{arguments[0]?.GetType()}' cannot be used in Handlebars XPath.");
-            }
-
-            return (nav, (string)arguments[1]);
-        }
-    }
-}

src/WireMock.Net/Transformers/Handlebars/HandlebarsXeger.cs

@@ -1,39 +0,0 @@
-using System;
-using Fare;
-using HandlebarsDotNet;
-using WireMock.Validation;
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class HandlebarsXeger
-    {
-        public static void Register(IHandlebars handlebarsContext)
-        {
-            handlebarsContext.RegisterHelper("Xeger", (writer, context, arguments) =>
-            {
-                string value = ParseArgumentAndGenerate(arguments);
-                writer.Write(value);
-            });
-
-            handlebarsContext.RegisterHelper("Xeger", (writer, options, context, arguments) =>
-            {
-                string value = ParseArgumentAndGenerate(arguments);
-                options.Template(writer, value);
-            });
-        }
-
-        private static string ParseArgumentAndGenerate(object[] arguments)
-        {
-            Check.Condition(arguments, args => args.Length == 1, nameof(arguments));
-            Check.NotNull(arguments[0], "arguments[0]");
-
-            switch (arguments[0])
-            {
-                case string pattern:
-                    return new Xeger(pattern).Generate();
-            }
-
-            throw new NotSupportedException($"The value '{arguments[0]}' with type '{arguments[0]?.GetType()}' cannot be used in Handlebars Xeger.");
-        }
-    }
-}

src/WireMock.Net/Transformers/Handlebars/WireMockHandlebarsHelpers.cs

@@ -1,30 +1,36 @@
-using HandlebarsDotNet;
-using HandlebarsDotNet.Helpers;
-using WireMock.Handlers;
-
-namespace WireMock.Transformers.Handlebars
-{
-    internal static class WireMockHandlebarsHelpers
-    {
-        public static void Register(IHandlebars handlebarsContext, IFileSystemHandler fileSystemHandler)
-        {
-            // Register https://github.com/StefH/Handlebars.Net.Helpers
-            HandlebarsHelpers.Register(handlebarsContext);
-
-            // Register WireMock.Net specific helpers
-            HandlebarsRegex.Register(handlebarsContext);
-
-            HandlebarsJsonPath.Register(handlebarsContext);
-
-            HandlebarsLinq.Register(handlebarsContext);
-
-            HandlebarsRandom.Register(handlebarsContext);
-
-            HandlebarsXeger.Register(handlebarsContext);
-
-            HandlebarsXPath.Register(handlebarsContext);
-
-            HandlebarsFile.Register(handlebarsContext, fileSystemHandler);
-        }
-    }
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using HandlebarsDotNet;
+using HandlebarsDotNet.Helpers;
+using HandlebarsDotNet.Helpers.Helpers;
+using WireMock.Handlers;
+
+namespace WireMock.Transformers.Handlebars
+{
+    internal static class WireMockHandlebarsHelpers
+    {
+        public static void Register(IHandlebars handlebarsContext, IFileSystemHandler fileSystemHandler)
+        {
+            // Register https://github.com/StefH/Handlebars.Net.Helpers
+            HandlebarsHelpers.Register(handlebarsContext, o =>
+            {
+                o.CustomHelperPaths = new string[]
+                {
+                    Directory.GetCurrentDirectory()
+#if !NETSTANDARD1_3
+                    , Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
+#endif
+                }
+                .Distinct()
+                .ToList();
+
+                o.CustomHelpers = new Dictionary<string, IHelpers>
+                {
+                    { "File", new FileHelpers(handlebarsContext, fileSystemHandler) }
+                };
+            });
+        }
+    }
 }

src/WireMock.Net/Transformers/Transformer.cs

@@ -112,7 +112,7 @@ namespace WireMock.Transformers.Handlebars
 
         private static JToken ReplaceSingleNode(ITransformerContext handlebarsContext, string stringValue, object model)
         {
-            string transformedString = handlebarsContext.ParseAndRender(stringValue, model);
+            string transformedString = handlebarsContext.ParseAndRender(stringValue, model) as string;
 
             if (!string.Equals(stringValue, transformedString))
             {

src/WireMock.Net/WireMock.Net.csproj

@@ -1,134 +1,133 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
-    <AssemblyTitle>WireMock.Net</AssemblyTitle>
-    <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>WireMock.Net</AssemblyName>
-    <PackageId>WireMock.Net</PackageId>
-    <PackageTags>tdd;mock;http;wiremock;test;server;unittest</PackageTags>
-    <RootNamespace>WireMock</RootNamespace>
-    <ProjectGuid>{D3804228-91F4-4502-9595-39584E5A01AD}</ProjectGuid>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <!--<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>-->
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>WireMock.Net.snk</AssemblyOriginatorKeyFile>
-    <!--<DelaySign>true</DelaySign>-->
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-  </PropertyGroup>
-
-  <!--<ItemGroup>
-    <None Include="WireMock.Net-Logo.png" Pack="true" PackagePath="../../"/>
-  </ItemGroup>-->
-
-  <!-- https://github.com/aspnet/RoslynCodeDomProvider/issues/51 -->
-  <!-- This is needed else we cannot build net452 in Azure DevOps Pipeline -->
-  <!--<Target Name="CheckIfShouldKillVBCSCompiler" />-->
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <!--<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
-    <CodeAnalysisRuleSet>WireMock.Net.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
-    <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
-    <DefineConstants>USE_ASPNETCORE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
-    <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
-  </PropertyGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
+    <AssemblyTitle>WireMock.Net</AssemblyTitle>
+    <Authors>Stef Heyenrath</Authors>
+    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>WireMock.Net</AssemblyName>
+    <PackageId>WireMock.Net</PackageId>
+    <PackageTags>tdd;mock;http;wiremock;test;server;unittest</PackageTags>
+    <RootNamespace>WireMock</RootNamespace>
+    <ProjectGuid>{D3804228-91F4-4502-9595-39584E5A01AD}</ProjectGuid>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <!--<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>-->
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>WireMock.Net.snk</AssemblyOriginatorKeyFile>
+    <!--<DelaySign>true</DelaySign>-->
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+  </PropertyGroup>
+
+  <!--<ItemGroup>
+    <None Include="WireMock.Net-Logo.png" Pack="true" PackagePath="../../"/>
+  </ItemGroup>-->
+
+  <!-- https://github.com/aspnet/RoslynCodeDomProvider/issues/51 -->
+  <!-- This is needed else we cannot build net452 in Azure DevOps Pipeline -->
+  <!--<Target Name="CheckIfShouldKillVBCSCompiler" />-->
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <!--<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
+    <CodeAnalysisRuleSet>WireMock.Net.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
+    <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
+    <DefineConstants>USE_ASPNETCORE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
+    <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
+  </PropertyGroup>
+
+	<ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.12" />
+    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.12" />
+    <PackageReference Include="JmesPath.Net" Version="1.0.125" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="7.8.0.7320">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
+    <PackageReference Include="XPath2.Extensions" Version="1.1.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net452' ">
+    <!-- Required for WebRequestHandler -->
+    <Reference Include="System.Net.Http.WebRequest" />
+
+    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
+    <PackageReference Include="Microsoft.Owin" Version="4.0.0" />
+    <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="4.0.0" />
+    <PackageReference Include="Microsoft.Owin.Hosting" Version="4.0.0" />
+    <PackageReference Include="System.Net.Http" Version="4.3.3" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+
+    <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
+    <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.3" />
+    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
+    <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
+    <PackageReference Include="Scriban.Signed" Version="3.3.2" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+
+    <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
+    <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Scriban.Signed" Version="3.3.2" />
+  </ItemGroup>
+
   <ItemGroup>
-    <Compile Remove="Transformers\Scriban\ScribanTransformer.cs" />
-    <Compile Remove="Transformers\Scriban\WireMockListAccessor.cs" />
-    <Compile Remove="Transformers\Scriban\WireMockTemplateContext.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.12" />
-    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.12" />
-    <PackageReference Include="JmesPath.Net" Version="1.0.125" />
-    <PackageReference Include="Handlebars.Net.Helpers" Version="1.1.0" />
-	  <!--<PackageReference Include="DotLiquid" Version="2.0.366" />-->
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="7.8.0.7320">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
-    <PackageReference Include="XPath2.Extensions" Version="1.1.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net452' ">
-    <!-- Required for WebRequestHandler -->
-    <Reference Include="System.Net.Http.WebRequest" />
-
-    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
-    <PackageReference Include="Microsoft.Owin" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Owin.Hosting" Version="4.0.0" />
-    <PackageReference Include="System.Net.Http" Version="4.3.3" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-
-    <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
-    <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.3" />
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
-    <PackageReference Include="Scriban.Signed" Version="3.3.2" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-
-    <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
-    <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Scriban.Signed" Version="3.3.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
-  </ItemGroup>
+    <PackageReference Include="Handlebars.Net.Helpers" Version="2.1.1" />
+    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.1.1" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.1.1" />
+    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.1.1" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.1.1" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.1.1" />
+
+    <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+  </ItemGroup>
 </Project>