Merge from master

examples/WireMock.Net.Console.Net452.Classic/CustomFileSystemFileHandler.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using WireMock.Handlers;
 
@@ -80,6 +80,12 @@ public byte[] ReadFile(string path)
  return File.ReadAllBytes(AdjustPath(path));
  }
 
+ /// <inheritdoc cref="IFileSystemHandler.ReadFileAsString"/>
+ public string ReadFileAsString(string path)
+ {
+ return File.ReadAllText(path);
+ }
+
  /// <summary>
  /// Adjusts the path to the MappingFolder.
  /// </summary>

examples/WireMock.Net.Console.Net452.Classic/MainApp.cs

@@ -59,7 +59,10 @@ public static void Run()
  //},
  PreWireMockMiddlewareInit = app => { System.Console.WriteLine($"PreWireMockMiddlewareInit : {app.GetType()}"); },
  PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); },
+
+#if USE_ASPNETCORE
  AdditionalServiceRegistration = services => { System.Console.WriteLine($"AdditionalServiceRegistration : {services.GetType()}"); },
+#endif
  Logger = new WireMockConsoleLogger(),
 
  HandlebarsRegistrationCallback = (handlebarsContext, fileSystemHandler) =>

examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj

@@ -36,6 +36,9 @@
  <ApplicationIcon>..\..\resources\WireMock.Net-Logo.ico</ApplicationIcon>
  </PropertyGroup>
  <ItemGroup>
+ <Reference Include="AnyOf, Version=0.2.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\AnyOf.0.2.0\lib\net45\AnyOf.dll</HintPath>
+ </Reference>
  <Reference Include="Handlebars, Version=2.0.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
  <HintPath>..\..\packages\Handlebars.Net.2.0.4\lib\net452\Handlebars.dll</HintPath>
  </Reference>

examples/WireMock.Net.Console.Net452.Classic/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+ <package id="AnyOf" version="0.2.0" targetFramework="net452" />
  <package id="Handlebars.Net" version="2.0.4" targetFramework="net452" />
  <package id="Handlebars.Net.Helpers" version="2.1.1-preview-01" targetFramework="net452" />
  <package id="Handlebars.Net.Helpers.Core" version="2.1.1-preview-01" targetFramework="net452" />

examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj

@@ -35,6 +35,9 @@
  <StartupObject>WireMock.Net.ConsoleApplication.Program</StartupObject>
  </PropertyGroup>
  <ItemGroup>
+ <Reference Include="AnyOf, Version=0.2.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\AnyOf.0.2.0\lib\net45\AnyOf.dll</HintPath>
+ </Reference>
  <Reference Include="Handlebars, Version=2.0.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
  <HintPath>..\..\packages\Handlebars.Net.2.0.4\lib\net46\Handlebars.dll</HintPath>
  </Reference>
@@ -47,6 +50,9 @@
  <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
  <HintPath>..\..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
  </Reference>
+ <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+ </Reference>
  <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
  <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
  </Reference>

examples/WireMock.Net.Console.Net461.Classic/packages.config

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+ <package id="AnyOf" version="0.2.0" targetFramework="net461" />
  <package id="Handlebars.Net" version="2.0.4" targetFramework="net461" />
  <package id="Handlebars.Net.Helpers" version="2.1.1-preview-01" targetFramework="net461" />
  <package id="Handlebars.Net.Helpers.Core" version="2.1.1-preview-01" targetFramework="net461" />
  <package id="log4net" version="2.0.12" targetFramework="net461" />
+ <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net461" />
  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
  <package id="System.ValueTuple" version="4.3.0" targetFramework="net461" />

examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj

@@ -39,6 +39,9 @@
  <StartupObject>WireMock.Net.ConsoleApplication.Program</StartupObject>
  </PropertyGroup>
  <ItemGroup>
+ <Reference Include="AnyOf, Version=0.2.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\AnyOf.0.2.0\lib\net45\AnyOf.dll</HintPath>
+ </Reference>
  <Reference Include="Fare, Version=2.1.0.0, Culture=neutral, PublicKeyToken=ea68d375bf33a7c8, processorArchitecture=MSIL">
  <HintPath>..\..\packages\Fare.2.1.1\lib\net35\Fare.dll</HintPath>
  </Reference>

examples/WireMock.Net.Console.Net472.Classic/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+ <package id="AnyOf" version="0.2.0" targetFramework="net472" />
  <package id="Fare" version="2.1.1" targetFramework="net472" />
  <package id="Handlebars.Net" version="2.0.4" targetFramework="net472" />
  <package id="Handlebars.Net.Helpers" version="2.1.1-preview-01" targetFramework="net472" />

src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs

@@ -1,4 +1,4 @@
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings
 {
  /// <summary>
  /// MatcherModel
@@ -12,15 +12,20 @@ public class MatcherModel
  public string Name { get; set; }
 
  /// <summary>
- /// Gets or sets the pattern. Can be a string (default) or an object;
+ /// Gets or sets the pattern. Can be a string (default) or an object.
  /// </summary>
  public object Pattern { get; set; }
 
  /// <summary>
- /// Gets or sets the patterns. Can be array of strings (default) or an array of objects;
+ /// Gets or sets the patterns. Can be array of strings (default) or an array of objects.
  /// </summary>
  public object[] Patterns { get; set; }
 
+ /// <summary>
+ /// Gets or sets the pattern as a file.
+ /// </summary>
+ public string PatternAsFile { get; set; }
+
  /// <summary>
  /// Gets or sets the ignore case.
  /// </summary>

src/WireMock.Net.Abstractions/Handlers/IFileSystemHandler.cs

@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using System.Collections.Generic;
 
 namespace WireMock.Handlers
@@ -89,5 +89,12 @@ public interface IFileSystemHandler
  /// <param name="filename">The filename.</param>
  /// <returns>The file content as bytes.</returns>
  byte[] ReadFile([NotNull] string filename);
+
+ /// <summary>
+ /// Read a file as string.
+ /// </summary>
+ /// <param name="filename">The filename.</param>
+ /// <returns>The file content as a string.</returns>
+ string ReadFileAsString([NotNull] string filename);
  }
 }