Fixed https proxy for netstandard 1.3 and netstandard 2.0 (#85)

src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
@@ -16,11 +16,17 @@
     <PackageLicenseUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/LICENSE</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <DebugType>portable</DebugType>
     <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
     <RootNamespace>WireMock.Net.StandAlone</RootNamespace>
   </PropertyGroup>
+  
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugType>full</DebugType>
+    <IncludeSource>True</IncludeSource>
+    <IncludeSymbols>True</IncludeSymbols>
+    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' ">
     <DefineConstants>NETSTANDARD</DefineConstants>

src/WireMock.Net/Http/HttpClientHelper.cs

@@ -43,7 +43,11 @@ namespace WireMock.Http
             // If UseCookies enabled, httpClient ignores Cookie header
             handler.UseCookies = false;
 
-            return new HttpClient(handler);
+            var client = new HttpClient(handler);
+#if NET452 || NET46
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
+#endif
+            return client;
         }
 
         public static async Task<ResponseMessage> SendAsync(HttpClient client, RequestMessage requestMessage, string url)

src/WireMock.Net/Http/PortUtil.cs

@@ -37,7 +37,7 @@ namespace WireMock.Http
         public static bool TryExtractProtocolAndPort(string url, out string proto, out int port)
         {
             proto = null;
-            port = -1;
+            port = 0;
 
             Match m = UrlDetailsRegex.Match(url);
             if (m.Success)

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -1,5 +1,8 @@
 #if NETSTANDARD
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
@@ -14,7 +17,7 @@ namespace WireMock.Owin
     {
         private readonly CancellationTokenSource _cts = new CancellationTokenSource();
         private readonly WireMockMiddlewareOptions _options;
-        private readonly string[] _uriPrefixes;
+        private readonly string[] _urls;
 
         private IWebHost _host;
 
@@ -38,7 +41,7 @@ namespace WireMock.Owin
             }
 
             _options = options;
-            _uriPrefixes = uriPrefixes;
+            _urls = uriPrefixes;
         }
 
         public Task StartAsync()
@@ -51,12 +54,38 @@ namespace WireMock.Owin
                     appBuilder.UseMiddleware<WireMockMiddleware>(_options);
                     _options.PostWireMockMiddlewareInit?.Invoke(appBuilder);
                 })
-                .UseKestrel()
-                .UseUrls(_uriPrefixes)
+                .UseKestrel(options =>
+                {
+#if NETSTANDARD1_3
+                    if (_urls.Any(u => u.StartsWith("https://", StringComparison.OrdinalIgnoreCase)))
+                    {
+                        options.UseHttps("self-signed-certificate.pfx");
+                    }
+#else
+                    // https://docs.microsoft.com/en-us/aspnet/core/fundamentals/servers/kestrel?tabs=aspnetcore2x
+                    foreach (string url in _urls.Where(u => u.StartsWith("http://", StringComparison.OrdinalIgnoreCase)))
+                    {
+                        PortUtil.TryExtractProtocolAndPort(url, out string host, out int port);
+                        options.Listen(IPAddress.Loopback, port);
+                    }
+
+                    foreach (string url in _urls.Where(u => u.StartsWith("https://", StringComparison.OrdinalIgnoreCase)))
+                    {
+                        PortUtil.TryExtractProtocolAndPort(url, out string host, out int port);
+                        options.Listen(IPAddress.Loopback, port, listenOptions =>
+                        {
+                            listenOptions.UseHttps("self-signed-certificate.pfx");
+                        });
+                    }
+#endif
+                })
+#if NETSTANDARD1_3
+                .UseUrls(_urls)
+#endif
                 .Build();
 
 #if NETSTANDARD1_3
-            System.Console.WriteLine("WireMock.Net server using netstandard1.3");
+            Console.WriteLine("WireMock.Net server using netstandard1.3");
             return Task.Run(() =>
             {
                 _host.Run(_cts.Token);
@@ -65,7 +94,11 @@ namespace WireMock.Owin
 #else
             System.Console.WriteLine("WireMock.Net server using netstandard2.0");
             IsStarted = true;
-            return _host.RunAsync(_cts.Token);
+            return Task.Run(() =>
+            {
+                _host.Run();
+                IsStarted = true;
+            }, _cts.Token);
 #endif
         }
 

src/WireMock.Net/Server/FluentMockServer.cs

@@ -157,7 +157,7 @@ namespace WireMock.Server
         {
             if (settings.Urls != null)
             {
-                Urls = settings.Urls;
+                Urls = settings.Urls.Select(u => u.EndsWith("/") ? u : $"{u}/").ToArray();
             }
             else
             {

src/WireMock.Net/WireMock.Net.csproj

@@ -16,12 +16,16 @@
     <PackageLicenseUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/LICENSE</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
     <RootNamespace>WireMock</RootNamespace>
-    <DebugType>full</DebugType> 
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugType>full</DebugType>
     <IncludeSource>True</IncludeSource>
     <IncludeSymbols>True</IncludeSymbols>
+    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0'">
@@ -33,7 +37,7 @@
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Handlebars.Net" Version="1.9.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
     <PackageReference Include="SimMetrics.Net" Version="1.0.4" />
     <PackageReference Include="System.Net.Http" Version="4.3.3" />
     <PackageReference Include="RestEase" Version="1.4.4" />
@@ -52,6 +56,7 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <PackageReference Include="Microsoft.AspNetCore" Version="1.1.5" />
+    <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" />
   </ItemGroup>
@@ -61,4 +66,10 @@
     <PackageReference Include="XPath2" Version="1.0.5.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="self-signed-certificate.pfx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>