Fix vulnerability in NuGet dependencies (#508)

* .

* .

* test

* Microsoft.AspNetCore.Server.IIS

Directory.Build.props

@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.2.18</VersionPrefix>
+    <VersionPrefix>1.3.0</VersionPrefix>
     <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
     <PackageIconUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>

WireMock.Net Solution.sln

@@ -63,13 +63,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NETCor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.RequestLogTest", "examples\WireMock.Net.Console.RequestLogTest\WireMock.Net.Console.RequestLogTest.csproj", "{A9D039B9-7509-4CF1-9EFD-87EB82998575}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Client.Net472", "examples\WireMock.Net.Client.Net472\WireMock.Net.Client.Net472.csproj", "{02082E34-DEF2-47D0-AF0B-3326FAA908CE}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.OpenApiParser", "src\WireMock.Net.OpenApiParser\WireMock.Net.OpenApiParser.csproj", "{D3804228-91F4-4502-9595-39584E5AADAD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.OpenApiParser.ConsoleApp", "examples\WireMock.Net.OpenApiParser.ConsoleApp\WireMock.Net.OpenApiParser.ConsoleApp.csproj", "{5C09FB93-1535-4F92-AF26-21E8A061EE4A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.FluentAssertions", "src\WireMock.Net.FluentAssertions\WireMock.Net.FluentAssertions.csproj", "{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.FluentAssertions", "src\WireMock.Net.FluentAssertions\WireMock.Net.FluentAssertions.csproj", "{B6269AAC-170A-4346-8B9A-579DED3D9A95}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -157,10 +155,6 @@ Global
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D3804228-91F4-4502-9595-39584E5AADAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D3804228-91F4-4502-9595-39584E5AADAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D3804228-91F4-4502-9595-39584E5AADAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -169,10 +163,10 @@ Global
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A95}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A95}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -198,10 +192,9 @@ Global
 		{668F689E-57B4-422E-8846-C0FF643CA268} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{83645809-9E01-4E81-8733-BA9497554ABF} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{D3804228-91F4-4502-9595-39584E5AADAD} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{B6269AAC-170A-4346-8B9A-579DED3D9A95} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}

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

@@ -133,7 +133,7 @@ namespace WireMock.Net.ConsoleApplication
                     .WithPath("/proxy-execute-keep-alive")
                 )
                 .RespondWith(Response.Create()
-                    .WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999", BlackListedHeaders = new[] { "Keep-Alive" } })
+                    .WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999", ExcludedHeaders = new[] { "Keep-Alive" } })
                     .WithHeader("Keep-Alive-Test", "stef")
                 );
 

examples/WireMock.Net.Console.Proxy.NETCoreApp2/Program.cs

@@ -28,7 +28,7 @@ namespace WireMock.Net.Console.Proxy.NETCoreApp2
                     //ClientX509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
                     SaveMapping = true,
                     SaveMappingToFile = false,
-                    BlackListedHeaders = new[] { "dnt", "Content-Length" }
+                    ExcludedHeaders = new[] { "dnt", "Content-Length" }
                 }
             });
 

examples/WireMock.Net.Console.Proxy.Net452/Program.cs

@@ -22,7 +22,7 @@ namespace WireMock.Net.Console.Proxy.Net452
                     //ClientX509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
                     SaveMapping = true,
                     SaveMappingToFile = false,
-                    BlackListedHeaders = new[] { "dnt", "Content-Length" }
+                    ExcludedHeaders = new[] { "dnt", "Content-Length" }
                 }
             });
 

examples/WireMock.Net.Console.Record.NETCoreApp/Program.cs

@@ -19,7 +19,7 @@ namespace WireMock.Net.Console.Proxy.NETCoreApp
                     //ClientX509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
                     SaveMapping = true,
                     SaveMappingToFile = false,
-                    BlackListedHeaders = new [] { "dnt", "Content-Length" }
+                    ExcludedHeaders = new [] { "dnt", "Content-Length" }
                 }
             });
 

examples/WireMock.Net.Console.RequestLogTest/Program.cs

@@ -14,7 +14,7 @@ namespace WireMock.Net.Console.RequestLogTest
     {
         static async Task Main(string[] args)
         {
-            var server = StandAloneApp.Start(new FluentMockServerSettings
+            var server = StandAloneApp.Start(new WireMockServerSettings
             {
                 Port = 19019,
                 StartAdminInterface = true,

examples/WireMock.Net.Service/WireMock.Net.Service.csproj

@@ -80,8 +80,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="XPath2, Version=1.0.9.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
+    <Reference Include="XPath2, Version=1.1.0.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XPath2.1.0.10\lib\net40\XPath2.dll</HintPath>
+      <HintPath>..\..\packages\XPath2.1.1.0\lib\net40\XPath2.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

examples/WireMock.Net.Service/packages.config

@@ -13,5 +13,5 @@
   <package id="Owin" version="1.0" targetFramework="net452" />
   <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
   <package id="System.Net.Http" version="4.3.3" targetFramework="net452" />
-  <package id="XPath2" version="1.0.10" targetFramework="net452" />
+  <package id="XPath2" version="1.1.0" targetFramework="net452" />
 </packages>

examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj

@@ -280,8 +280,8 @@
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="XPath2, Version=1.0.7.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
+    <Reference Include="XPath2, Version=1.1.0.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XPath2.1.0.6.1\lib\net40\XPath2.dll</HintPath>
+      <HintPath>..\..\packages\XPath2.1.1.0\lib\net40\XPath2.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

examples/WireMock.Net.StandAlone.Net461/packages.config

@@ -78,5 +78,5 @@
   <package id="System.Security.Principal.Windows" version="4.5.1" targetFramework="net461" />
   <package id="System.Text.Encodings.Web" version="4.5.0" targetFramework="net461" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
-  <package id="XPath2" version="1.0.6.1" targetFramework="net461" />
+  <package id="XPath2" version="1.1.0" targetFramework="net461" />
 </packages>

src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj

@@ -19,7 +19,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-		<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.2.0" />
+		<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.2.3" />
 		<PackageReference Include="RamlToOpenApiConverter" Version="0.1.1" />
 		<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />

src/WireMock.Net/Server/FluentMockServer.cs

@@ -1,13 +0,0 @@
-using System;
-using WireMock.Settings;
-
-namespace WireMock.Server
-{
-    [Obsolete("Use WireMockServer. This will removed in next version (1.3.x)")]
-    public class FluentMockServer : WireMockServer
-    {
-        public FluentMockServer(IFluentMockServerSettings settings) : base((IWireMockServerSettings) settings)
-        {
-        }
-    }
-}

src/WireMock.Net/Server/WireMockServer.Admin.cs

@@ -277,8 +277,8 @@ namespace WireMock.Server
                 var mapping = ToMapping(
                     requestMessage,
                     responseMessage,
-                    settings.ProxyAndRecordSettings.BlackListedHeaders ?? new string[] { },
+                    settings.ProxyAndRecordSettings.ExcludedHeaders ?? new string[] { },
-                    settings.ProxyAndRecordSettings.BlackListedCookies ?? new string[] { }
+                    settings.ProxyAndRecordSettings.ExcludedCookies ?? new string[] { }
                 );
 
                 if (settings.ProxyAndRecordSettings.SaveMapping)

src/WireMock.Net/Settings/FluentMockServerSettings.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace WireMock.Settings
-{
-    /// <summary>
-    /// FluentMockServerSettings
-    /// </summary>
-    [Obsolete("Use WireMockServerSettings. This will removed in next version (1.3.x)")]
-    public class FluentMockServerSettings : WireMockServerSettings
-    {
-    }
-}

src/WireMock.Net/Settings/IFluentMockServerSettings.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace WireMock.Settings
-{
-    /// <summary>
-    /// IFluentMockServerSettings
-    /// </summary>
-    [Obsolete("Use IWireMockServerSettings. This will removed in next version (1.3.x)")]
-    public interface IFluentMockServerSettings : IWireMockServerSettings
-    {
-    }
-}

src/WireMock.Net/Settings/IProxyAndRecordSettings.cs

@@ -1,5 +1,4 @@
-using System;
+using JetBrains.Annotations;
-using JetBrains.Annotations;
 
 namespace WireMock.Settings
 {
@@ -39,14 +38,12 @@ namespace WireMock.Settings
         /// <summary>
         /// Defines a list from headers which will be excluded from the saved mappings.
         /// </summary>
-        [Obsolete("Will be renamed to ExcludedHeaders in next version (1.3.x)")]
+        string[] ExcludedHeaders { get; set; }
-        string[] BlackListedHeaders { get; set; }
 
         /// <summary>
         /// Defines a list of cookies which will be excluded from the saved mappings.
         /// </summary>
-        [Obsolete("Will be renamed to ExcludedCookies in next version (1.3.x)")]
+        string[] ExcludedCookies { get; set; }
-        string[] BlackListedCookies { get; set; }
 
         /// <summary>
         /// Defines the WebProxySettings.

src/WireMock.Net/Settings/ProxyAndRecordSettings.cs

@@ -1,5 +1,4 @@
-using System;
+using JetBrains.Annotations;
-using JetBrains.Annotations;
 
 namespace WireMock.Settings
 {
@@ -40,15 +39,13 @@ namespace WireMock.Settings
         [PublicAPI]
         public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
 
-        /// <inheritdoc cref="IProxyAndRecordSettings.BlackListedHeaders"/>
+        /// <inheritdoc cref="IProxyAndRecordSettings.ExcludedHeaders"/>
         [PublicAPI]
-        [Obsolete("Will be renamed to ExcludedHeaders in next version (1.3.x)")]
+        public string[] ExcludedHeaders { get; set; }
-        public string[] BlackListedHeaders { get; set; }
 
-        /// <inheritdoc cref="IProxyAndRecordSettings.BlackListedCookies"/>
+        /// <inheritdoc cref="IProxyAndRecordSettings.ExcludedCookies"/>
         [PublicAPI]
-        [Obsolete("Will be renamed to ExcludedCookies in next version (1.3.x)")]
+        public string[] ExcludedCookies { get; set; }
-        public string[] BlackListedCookies { get; set; }
 
         /// <inheritdoc cref="IProxyAndRecordSettings.WebProxySettings"/>
         [PublicAPI]

src/WireMock.Net/Settings/WireMockServerSettingsParser.cs

@@ -70,8 +70,8 @@ namespace WireMock.Settings
                     SaveMappingToFile = parser.GetBoolValue("SaveMappingToFile"),
                     SaveMappingForStatusCodePattern = parser.GetStringValue("SaveMappingForStatusCodePattern"),
                     ClientX509Certificate2ThumbprintOrSubjectName = parser.GetStringValue("ClientX509Certificate2ThumbprintOrSubjectName"),
-                    BlackListedHeaders = parser.GetValues("BlackListedHeaders"),
+                    ExcludedHeaders = parser.GetValues("ExcludedHeaders"),
-                    BlackListedCookies = parser.GetValues("BlackListedCookies"),
+                    ExcludedCookies = parser.GetValues("ExcludedCookies"),
                     AllowAutoRedirect = parser.GetBoolValue("AllowAutoRedirect")
                 };
 

src/WireMock.Net/WireMock.Net.csproj

@@ -56,7 +56,7 @@
     <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.10" />
+    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.12" />
     <PackageReference Include="JmesPath.Net" Version="1.0.125" />
     <PackageReference Include="Handlebars.Net.Helpers" Version="1.0.0" />
   </ItemGroup>
@@ -69,7 +69,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
-    <PackageReference Include="XPath2.Extensions" Version="1.0.6.1" />
+    <PackageReference Include="XPath2.Extensions" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
@@ -101,7 +101,11 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.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" />
+
     <PackageReference Include="CS-Script" Version="3.29.0" />
   </ItemGroup>
 
@@ -114,12 +118,18 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.AspNetCore" 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" />
     <PackageReference Include="CS-Script.Core" Version="1.1.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Include="Microsoft.AspNetCore" 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" />
 
     <!-- https://github.com/WireMock-Net/WireMock.Net/issues/448 -->
     <PackageReference Include="CS-Script.Core" Version="1.3.1" />

test/WireMock.Net.Tests/WireMock.Net.Tests.csproj

@@ -44,17 +44,17 @@
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="System.Threading" Version="4.3.0" />
     <PackageReference Include="RestEase" Version="1.4.10" />
-    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.10" />
+    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.12" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="Moq" Version="4.13.1" />
+    <PackageReference Include="Moq" Version="4.14.5" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NFluent" Version="2.7.0" />
     <PackageReference Include="OpenCover" Version="4.7.922" />
-    <PackageReference Include="ReportGenerator" Version="4.5.4" />
+    <PackageReference Include="ReportGenerator" Version="4.6.7" />
     <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.12" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>