WireMock-Net · StefH · Apr 21, 2022 · Apr 3, 2022 · Apr 3, 2022 · Apr 3, 2022
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,6 +13,8 @@
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
         <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
+        <LangVersion>Latest</LangVersion>
+        <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
@@ -24,6 +26,10 @@
         <!--<None Include="../../PackageReadme.md" Pack="true" PackagePath=""/>-->
     </ItemGroup>
 
+    <PropertyGroup Condition="'$(TargetFramework)' != 'net45'">
+        <!--<Nullable>enable</Nullable>-->
+    </PropertyGroup>
+
     <Choose>
         <!-- The environment variable `Prerelease` is set in the azure-pipelines.yml file. -->
         <When Condition=" '$(Prerelease)' != '' ">

diff --git a/WireMock.Net Solution.sln b/WireMock.Net Solution.sln
@@ -40,8 +40,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Client", "exam
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NETCoreApp", "examples\WireMock.Net.Console.NETCoreApp\WireMock.Net.Console.NETCoreApp.csproj", "{FE281639-B014-4C8A-96FA-141164A74713}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.Proxy.NETCoreApp", "examples\WireMock.Net.Console.Record.NETCoreApp\WireMock.Net.Console.Proxy.NETCoreApp.csproj", "{1995E414-F197-4AB4-90C2-68D806B5AF59}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.StandAlone.NETCoreApp", "examples\WireMock.Net.StandAlone.NETCoreApp\WireMock.Net.StandAlone.NETCoreApp.csproj", "{10E16614-61CA-48D8-8BDD-664C13913DED}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net452", "examples\WireMock.Net.StandAlone.Net452\WireMock.Net.StandAlone.Net452.csproj", "{668F689E-57B4-422E-8846-C0FF643CA999}"
@@ -101,6 +99,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NET6",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication.NET6", "examples\WireMock.Net.WebApplication.NET6\WireMock.Net.WebApplication.NET6.csproj", "{3F7AA023-6833-4856-A08A-4B5717B592B8}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.Proxy.NETCoreApp", "examples\WireMock.Net.Console.Proxy.NETCoreApp\WireMock.Net.Console.Proxy.NETCoreApp.csproj", "{670C7562-C154-442E-A249-7D26849BCD13}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -143,10 +143,6 @@ Global
 		{FE281639-B014-4C8A-96FA-141164A74713}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FE281639-B014-4C8A-96FA-141164A74713}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE281639-B014-4C8A-96FA-141164A74713}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Release|Any CPU.Build.0 = Release|Any CPU
 		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{10E16614-61CA-48D8-8BDD-664C13913DED}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -239,6 +235,10 @@ Global
 		{3F7AA023-6833-4856-A08A-4B5717B592B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3F7AA023-6833-4856-A08A-4B5717B592B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3F7AA023-6833-4856-A08A-4B5717B592B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{670C7562-C154-442E-A249-7D26849BCD13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{670C7562-C154-442E-A249-7D26849BCD13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{670C7562-C154-442E-A249-7D26849BCD13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{670C7562-C154-442E-A249-7D26849BCD13}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -253,7 +253,6 @@ Global
 		{41C19451-E980-4ED4-A011-DA7A1C23FC05} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{FE281639-B014-4C8A-96FA-141164A74713} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{1995E414-F197-4AB4-90C2-68D806B5AF59} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{10E16614-61CA-48D8-8BDD-664C13913DED} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{668F689E-57B4-422E-8846-C0FF643CA999} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{26433A8F-BF01-4962-97EB-81BFFBB61096} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
@@ -279,6 +278,7 @@ Global
 		{3BA5109E-5F30-4CC2-B699-02EC82560AA6} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{2215055B-594E-4C2F-99B2-6DF337F02893} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{3F7AA023-6833-4856-A08A-4B5717B592B8} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{670C7562-C154-442E-A249-7D26849BCD13} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}

diff --git a/examples/WireMock.Net.Console.Proxy.NETCoreApp/501d5907-7f73-46dc-a1c6-1a48f39b103a.json b/examples/WireMock.Net.Console.Proxy.NETCoreApp/501d5907-7f73-46dc-a1c6-1a48f39b103a.json
@@ -0,0 +1,169 @@
+{
+  "Guid": "501d5907-7f73-46dc-a1c6-1a48f39b103a",
+  "Title": "",
+  "Request": {
+    "Path": {
+      "Matchers": [
+        {
+          "Name": "WildcardMatcher",
+          "Pattern": "/post",
+          "IgnoreCase": false
+        }
+      ]
+    },
+    "Methods": [
+      "POST"
+    ],
+    "Headers": [
+      {
+        "Name": "Accept",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "*/*",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "Connection",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "keep-alive",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "Host",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "localhost:9091",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "User-Agent",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "PostmanRuntime/7.29.0",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "Accept-Encoding",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "gzip, deflate, br",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "Authorization",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "BASIC 1234",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "Content-Type",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "application/vnd.contoso+json",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "Content-Length",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "16",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "postmanecho",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "post",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "Test123",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "application/vnd.contoso+json",
+            "IgnoreCase": true
+          }
+        ]
+      }
+    ],
+    "Body": {
+      "Matcher": {
+        "Name": "JsonMatcher",
+        "Pattern": {
+          "test": 42
+        },
+        "IgnoreCase": true
+      }
+    }
+  },
+  "Response": {
+    "StatusCode": 200,
+    "BodyAsJson": {
+      "args": {},
+      "data": {
+        "test": "Stef"
+      },
+      "files": {},
+      "form": {},
+      "headers": {
+        "x-forwarded-proto": "http",
+        "x-forwarded-port": "80",
+        "host": "postman-echo.com",
+        "x-amzn-trace-id": "Root=1-624a96e3-023cf5a15966164e7156c20d",
+        "content-length": "11",
+        "accept": "*/*",
+        "user-agent": "PostmanRuntime/7.29.0",
+        "accept-encoding": "gzip, deflate, br",
+        "authorization": "BASIC 1234",
+        "cookie": "sails.sid=s%3AMpD3hNdjm1Ilte_ml7vgmEopThEhwAbr.HDn7RFcO3qK7oVXIxK3Pxk23g1qHDrNZIN4NozK5oog",
+        "postmanecho": "post",
+        "test123": "application/vnd.contoso+json",
+        "postman-token": "050b1136-19ed-4fbe-ad2a-338a20237321",
+        "content-type": "application/vnd.contoso+json"
+      },
+      "json": {
+        "test": "Stef"
+      },
+      "url": "http://postman-echo.com/post"
+    },
+    "Headers": {
+      "Content-Type": "application/json; charset=utf-8",
+      "Content-Length": "663",
+      "Date": "Mon, 04 Apr 2022 06:57:39 GMT",
+      "Connection": "keep-alive",
+      "ETag": "W/\"297-FimzXopdNUy6DBi49iOW6Tm9q0o\"",
+      "Vary": "Accept-Encoding",
+      "Set-Cookie": "sails.sid=s%3AhtpOsTOJqbHuXmMAZT6cyHLR6FBx1XhV.0loKIsdu5GJKgjJeha16NVWYl%2B0BvPeEQYHcLBCLJ20; Path=/; HttpOnly"
+    }
+  }
+}
diff --git a/examples/WireMock.Net.Console.Proxy.NETCoreApp/Program.cs b/examples/WireMock.Net.Console.Proxy.NETCoreApp/Program.cs
@@ -0,0 +1,53 @@
+using Newtonsoft.Json;
+using WireMock.Logging;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.Console.Proxy.NETCoreApp;
+
+static class Program
+{
+    static void Main(params string[] args)
+    {
+        var server = WireMockServer.Start(new WireMockServerSettings
+        {
+            Logger = new WireMockConsoleLogger(),
+            Urls = new[] { "http://localhost:9091/", "https://localhost:9443/" },
+            StartAdminInterface = true,
+            ReadStaticMappings = true,
+            WatchStaticMappings = true,
+            WatchStaticMappingsInSubdirectories = true,
+            ProxyAndRecordSettings = new ProxyAndRecordSettings
+            {
+                Url = "http://postman-echo.com/post",
+                SaveMapping = true,
+                SaveMappingToFile = true,
+                ExcludedHeaders = new[] { "Postman-Token" },
+                ExcludedCookies = new[] { "sails.sid" }
+            }
+        });
+
+        //server
+        //    .Given(Request.Create().UsingGet())
+        //    .RespondWith(Response.Create()
+        //       .WithProxy(new ProxyAndRecordSettings
+        //       {
+        //           Url = "http://postman-echo.com/post",
+        //           SaveMapping = true,
+        //           SaveMappingToFile = true
+        //       }));
+
+        System.Console.WriteLine("Press any key to stop the server");
+        System.Console.ReadKey();
+        server.Stop();
+
+        System.Console.WriteLine("Displaying all requests");
+        var allRequests = server.LogEntries;
+        System.Console.WriteLine(JsonConvert.SerializeObject(allRequests, Formatting.Indented));
+
+        System.Console.WriteLine("Press any key to quit");
+        System.Console.ReadKey();
+    }
+}
diff --git a/...eMock.Net.Console.Proxy.NETCoreApp.csproj → ...eMock.Net.Console.Proxy.NETCoreApp.csproj b/...eMock.Net.Console.Proxy.NETCoreApp.csproj → ...eMock.Net.Console.Proxy.NETCoreApp.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
   </PropertyGroup>
 

diff --git a/examples/WireMock.Net.Console.Record.NETCoreApp/Program.cs b/examples/WireMock.Net.Console.Record.NETCoreApp/Program.cs