Support Microsoft.AspNetCore for net 4.6.1 and up (#185)

* net451 * tests : net462 * fixed tests * fix tests * readme * Code review * LocalFileSystemHandlerTests * refactor
2026-03-19 07:54:53 +01:00 · 2018-08-17 18:52:29 +02:00
parent 01d6dce62d
commit b57d118c3d
69 changed files with 842 additions and 2032 deletions
--- a/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
+++ b/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
@@ -5,7 +5,7 @@
    <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
    <Version>1.0.4.10</Version>
    <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net451;net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
    <AssemblyName>WireMock.Net.StandAlone</AssemblyName>
    <PackageId>WireMock.Net.StandAlone</PackageId>
@@ -30,7 +30,11 @@
  </PropertyGroup>

  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>NETSTANDARD</DefineConstants>
+    <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
+    <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
  </PropertyGroup>

  <ItemGroup>
--- a/src/WireMock.Net/Handlers/LocalFileSystemHandler.cs
+++ b/src/WireMock.Net/Handlers/LocalFileSystemHandler.cs
@@ -1,5 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
+using JetBrains.Annotations;
+using WireMock.Validation;

 namespace WireMock.Handlers
 {
@@ -11,20 +13,26 @@ namespace WireMock.Handlers
        private static readonly string AdminMappingsFolder = Path.Combine("__admin", "mappings");

        /// <inheritdoc cref="IFileSystemHandler.FolderExists"/>
-        public bool FolderExists(string path)
+        public bool FolderExists([NotNull] string path)
        {
+            Check.NotNullOrEmpty(path, nameof(path));
+
            return Directory.Exists(path);
        }

        /// <inheritdoc cref="IFileSystemHandler.CreateFolder"/>
-        public void CreateFolder(string path)
+        public void CreateFolder([NotNull] string path)
        {
+            Check.NotNullOrEmpty(path, nameof(path));
+
            Directory.CreateDirectory(path);
        }

        /// <inheritdoc cref="IFileSystemHandler.EnumerateFiles"/>
-        public IEnumerable<string> EnumerateFiles(string path)
+        public IEnumerable<string> EnumerateFiles([NotNull] string path)
        {
+            Check.NotNullOrEmpty(path, nameof(path));
+
            return Directory.EnumerateFiles(path);
        }

@@ -35,14 +43,19 @@ namespace WireMock.Handlers
        }

        /// <inheritdoc cref="IFileSystemHandler.ReadMappingFile"/>
-        public string ReadMappingFile(string path)
+        public string ReadMappingFile([NotNull] string path)
        {
+            Check.NotNullOrEmpty(path, nameof(path));
+
            return File.ReadAllText(path);
        }

        /// <inheritdoc cref="IFileSystemHandler.WriteMappingFile"/>
-        public void WriteMappingFile(string path, string text)
+        public void WriteMappingFile([NotNull] string path, [NotNull] string text)
        {
+            Check.NotNullOrEmpty(path, nameof(path));
+            Check.NotNull(text, nameof(text));
+
            File.WriteAllText(path, text);
        }
    }
--- a/src/WireMock.Net/Http/PortUtil.cs
+++ b/src/WireMock.Net/Http/PortUtil.cs
@@ -9,7 +9,7 @@ namespace WireMock.Http
    /// </summary>
    public static class PortUtil
    {
-        private static readonly Regex UrlDetailsRegex = new Regex(@"^(?<proto>\w+)://[^/]+?(?<port>\d+)?/", RegexOptions.Compiled);
+        private static readonly Regex UrlDetailsRegex = new Regex(@"^(?<proto>\w+)://[^/]+?(?<port>\d+)/?", RegexOptions.Compiled);

        /// <summary>
        /// Finds a free TCP port.
--- a/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs
+++ b/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD
+#if USE_ASPNETCORE
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -107,9 +107,15 @@ namespace WireMock.Owin
                IsStarted = true;
 #if NETSTANDARD1_3
                _logger.Info("WireMock.Net server using netstandard1.3");
+#elif NETSTANDARD2_0
+                _logger.Info("WireMock.Net server using netstandard2.0");
+#elif NET46
+                _logger.Info("WireMock.Net server using .net 4.6.1 or higher");
+#endif
+
+#if NETSTANDARD1_3
                _host.Run(_cts.Token);
 #else
-                _logger.Info("WireMock.Net server using netstandard2.0");
                _host.RunAsync(_cts.Token).Wait();
 #endif
            }
@@ -132,7 +138,7 @@ namespace WireMock.Owin
 #if NETSTANDARD1_3
            return Task.FromResult(true);
 #else
-            return _host.WaitForShutdownAsync();
+            return _host.StopAsync();
 #endif
        }
    }
--- a/src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs
+++ b/src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
 using Microsoft.Owin;
 #else
 using Microsoft.AspNetCore.Http;
@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Http;

 namespace WireMock.Owin
 {
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
    internal class GlobalExceptionMiddleware : OwinMiddleware
 #else
    internal class GlobalExceptionMiddleware
@@ -17,7 +17,7 @@ namespace WireMock.Owin
    {
        private readonly WireMockMiddlewareOptions _options;

-#if !NETSTANDARD
+#if !USE_ASPNETCORE
        public GlobalExceptionMiddleware(OwinMiddleware next, WireMockMiddlewareOptions options) : base(next)
        {
            _options = options;
@@ -30,13 +30,13 @@ namespace WireMock.Owin
        }
 #endif

-#if NETSTANDARD
+#if USE_ASPNETCORE
        public RequestDelegate Next { get; }
 #endif

        private readonly OwinResponseMapper _responseMapper = new OwinResponseMapper();

-#if !NETSTANDARD
+#if !USE_ASPNETCORE
        public override async Task Invoke(IOwinContext ctx)
 #else
        public async Task Invoke(HttpContext ctx)
--- a/src/WireMock.Net/Owin/OwinRequestMapper.cs
+++ b/src/WireMock.Net/Owin/OwinRequestMapper.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using WireMock.Util;
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
 using Microsoft.Owin;
 #else
 using Microsoft.AspNetCore.Http;
@@ -23,14 +23,14 @@ namespace WireMock.Owin
        /// <param name="request"></param>
        /// <returns></returns>
        public async Task<RequestMessage> MapAsync(
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
            IOwinRequest request
 #else
            HttpRequest request
 #endif
            )
        {
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
            var urldetails = UrlUtils.Parse(request.Uri, request.PathBase);
            string clientIP = request.RemoteIpAddress;
 #else
--- a/src/WireMock.Net/Owin/OwinResponseMapper.cs
+++ b/src/WireMock.Net/Owin/OwinResponseMapper.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using Newtonsoft.Json;
 using WireMock.Http;
 using WireMock.Util;
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
 using Microsoft.Owin;
 #else
 using Microsoft.AspNetCore.Http;
@@ -24,7 +24,7 @@ namespace WireMock.Owin
        private readonly Encoding _utf8NoBom = new UTF8Encoding(false);

        // https://msdn.microsoft.com/en-us/library/78h415ay(v=vs.110).aspx
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
        private static readonly IDictionary<string, Action<IOwinResponse, WireMockList<string>>> ResponseHeadersToFix = new Dictionary<string, Action<IOwinResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
 #else
        private static readonly IDictionary<string, Action<HttpResponse, WireMockList<string>>> ResponseHeadersToFix = new Dictionary<string, Action<HttpResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
@@ -33,7 +33,7 @@ namespace WireMock.Owin
        };

        private void SetResponseHeaders(ResponseMessage responseMessage
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
            , IOwinResponse response
 #else
            , HttpResponse response
@@ -49,7 +49,7 @@ namespace WireMock.Owin
                }
                else
                {
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
                    // For non-NETSTANDARD, check if this response header can be added (#148)
                    if (!WebHeaderCollection.IsRestricted(pair.Key, true))
                    {
@@ -69,7 +69,7 @@ namespace WireMock.Owin
        /// <param name="responseMessage"></param>
        /// <param name="response"></param>
        public async Task MapAsync(ResponseMessage responseMessage
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
            , IOwinResponse response
 #else
            , HttpResponse response
--- a/src/WireMock.Net/Owin/OwinSelfHost.cs
+++ b/src/WireMock.Net/Owin/OwinSelfHost.cs
@@ -1,4 +1,4 @@
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
 using JetBrains.Annotations;
 using Microsoft.Owin.Hosting;
 using Owin;
@@ -65,9 +65,9 @@ namespace WireMock.Owin
        private void StartServers()
        {
 #if NET46
-            _logger.Info("WireMock.Net server using .net 4.6.x or higher");
+            _logger.Info("WireMock.Net server using .net 4.6.1 or higher");
 #else
-            _logger.Info("WireMock.Net server using .net 4.5.x or higher");
+            _logger.Info("WireMock.Net server using .net 4.5.x");
 #endif
            var servers = new List<IDisposable>();

--- a/src/WireMock.Net/Owin/WireMockMiddleware.cs
+++ b/src/WireMock.Net/Owin/WireMockMiddleware.cs
@@ -9,7 +9,7 @@ using WireMock.Util;
 using Newtonsoft.Json;
 using WireMock.Http;
 using WireMock.Serialization;
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
 using Microsoft.Owin;
 #else
 using Microsoft.AspNetCore.Http;
@@ -17,7 +17,7 @@ using Microsoft.AspNetCore.Http;

 namespace WireMock.Owin
 {
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
    internal class WireMockMiddleware : OwinMiddleware
 #else
    internal class WireMockMiddleware
@@ -29,7 +29,7 @@ namespace WireMock.Owin
        private readonly OwinRequestMapper _requestMapper = new OwinRequestMapper();
        private readonly OwinResponseMapper _responseMapper = new OwinResponseMapper();

-#if !NETSTANDARD
+#if !USE_ASPNETCORE
        public WireMockMiddleware(OwinMiddleware next, WireMockMiddlewareOptions options) : base(next)
        {
            _options = options;
@@ -41,7 +41,7 @@ namespace WireMock.Owin
        }
 #endif

-#if !NETSTANDARD
+#if !USE_ASPNETCORE
        public override async Task Invoke(IOwinContext ctx)
 #else
        public async Task Invoke(HttpContext ctx)
--- a/src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs
+++ b/src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs
@@ -4,7 +4,7 @@ using System.Collections.ObjectModel;
 using WireMock.Logging;
 using WireMock.Matchers;
 using WireMock.Util;
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
 using Owin;
 #else
 using Microsoft.AspNetCore.Builder;
@@ -32,7 +32,7 @@ namespace WireMock.Owin

        public int? MaxRequestLogCount { get; set; }

-#if !NETSTANDARD
+#if !USE_ASPNETCORE
        public Action<IAppBuilder> PreWireMockMiddlewareInit { get; set; }

        public Action<IAppBuilder> PostWireMockMiddlewareInit { get; set; }
--- a/src/WireMock.Net/Server/FluentMockServer.cs
+++ b/src/WireMock.Net/Server/FluentMockServer.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using WireMock.Handlers;
 using WireMock.Http;
@@ -77,7 +78,7 @@ namespace WireMock.Server
        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
        protected virtual void Dispose(bool disposing)
        {
-            if (_httpServer != null && _httpServer.IsStarted)
+            if (_httpServer != null)
            {
                _httpServer.StopAsync();
            }
@@ -194,19 +195,19 @@ namespace WireMock.Server

            if (settings.Urls != null)
            {
-                Urls = settings.Urls.Select(u => u.EndsWith("/") ? u : $"{u}/").ToArray();
+                Urls = settings.Urls.ToArray();
            }
            else
            {
                int port = settings.Port > 0 ? settings.Port.Value : PortUtil.FindFreeTcpPort();
-                Urls = new[] { (settings.UseSSL == true ? "https" : "http") + "://localhost:" + port + "/" };
+                Urls = new[] { $"{(settings.UseSSL == true ? "https" : "http")}://localhost:{port}" };
            }

            _options.PreWireMockMiddlewareInit = settings.PreWireMockMiddlewareInit;
            _options.PostWireMockMiddlewareInit = settings.PostWireMockMiddlewareInit;
            _options.Logger = _logger;

-#if NETSTANDARD
+#if USE_ASPNETCORE
            _httpServer = new AspNetCoreSelfHost(_options, Urls);
 #else
            _httpServer = new OwinSelfHost(_options, Urls);
--- a/src/WireMock.Net/Util/UrlUtils.cs
+++ b/src/WireMock.Net/Util/UrlUtils.cs
@@ -1,7 +1,7 @@
 using System;
 using JetBrains.Annotations;
 using WireMock.Models;
-#if !NETSTANDARD
+#if !USE_ASPNETCORE
 using Microsoft.Owin;
 #else
 using Microsoft.AspNetCore.Http;
--- a/src/WireMock.Net/WireMock.Net.csproj
+++ b/src/WireMock.Net/WireMock.Net.csproj
@@ -5,7 +5,7 @@
    <AssemblyTitle>WireMock.Net</AssemblyTitle>
    <Version>1.0.4.10</Version>
    <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0</TargetFrameworks>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
    <AssemblyName>WireMock.Net</AssemblyName>
    <PackageId>WireMock.Net</PackageId>
@@ -24,13 +24,17 @@
    <ProjectGuid>{D3804228-91F4-4502-9595-39584E5A01AD}</ProjectGuid>
  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
  </PropertyGroup>

-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0'">
-    <DefineConstants>NETSTANDARD</DefineConstants>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0'">
+    <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
+    <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
  </PropertyGroup>

  <ItemGroup>
@@ -41,15 +45,23 @@
    <PackageReference Include="JetBrains.Annotations" Version="11.1.0">
      <PrivateAssets>All</PrivateAssets>
    </PackageReference>
-    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
    <PackageReference Include="SimMetrics.Net" Version="1.0.4" />
    <PackageReference Include="System.Net.Http" Version="4.3.3" />
    <PackageReference Include="RestEase" Version="1.4.4" />
    <PackageReference Include="MimeKitLite" Version="2.0.1" />
  </ItemGroup>

+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <PackageReference Include="Handlebars.Net" Version="1.9.0" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
+    <PackageReference Include="XPath2" Version="1.0.5.1" />
+    <Reference Include="System.Net.Http.WebRequest" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+  </ItemGroup>
+
  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
+    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
    <PackageReference Include="XPath2" Version="1.0.5.1" />
    <Reference Include="System.Net.Http.WebRequest" />
@@ -57,6 +69,7 @@
  </ItemGroup>

  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
    <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" />
@@ -66,7 +79,14 @@
    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
  </ItemGroup>

+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.2" />
+    <PackageReference Include="XPath2" Version="1.0.5.1" />
+  </ItemGroup>
+
  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
    <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" />
@@ -75,7 +95,8 @@
  </ItemGroup>

  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.0.0" />
+    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.2" />
    <PackageReference Include="XPath2" Version="1.0.5.1" />
  </ItemGroup>