From 525ac4d2d74b3fbb45beaa11f7806dc9a0edfd7f Mon Sep 17 00:00:00 2001
From: Anthony Iacono <anthony.iacono@willowtreeapps.com>
Date: Tue, 29 Sep 2020 13:20:08 -0400
Subject: [PATCH 1/3] Adding netcoreapp3.0 and netcoreapp3.1 as a target
 framework

---
 src/WireMock.Net/Http/HttpClientHelper.cs |  2 +-
 src/WireMock.Net/WireMock.Net.csproj      | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/WireMock.Net/Http/HttpClientHelper.cs b/src/WireMock.Net/Http/HttpClientHelper.cs
index b606bb607..375f5c310 100644
--- a/src/WireMock.Net/Http/HttpClientHelper.cs
+++ b/src/WireMock.Net/Http/HttpClientHelper.cs
@@ -13,7 +13,7 @@ internal static class HttpClientHelper
     {
         public static HttpClient CreateHttpClient(IProxyAndRecordSettings settings)
         {
-#if NETSTANDARD
+#if NETSTANDARD || USE_ASPNETCORE
             var handler = new HttpClientHandler
             {
                 CheckCertificateRevocationList = false,
diff --git a/src/WireMock.Net/WireMock.Net.csproj b/src/WireMock.Net/WireMock.Net.csproj
index 7f4f0a8ae..64c103133 100644
--- a/src/WireMock.Net/WireMock.Net.csproj
+++ b/src/WireMock.Net/WireMock.Net.csproj
@@ -3,7 +3,7 @@
     <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
     <AssemblyTitle>WireMock.Net</AssemblyTitle>
     <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>WireMock.Net</AssemblyName>
     <PackageId>WireMock.Net</PackageId>
@@ -42,7 +42,7 @@
     <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2' or '$(TargetFramework)' == 'netcoreapp3.0' or '$(TargetFramework)' == 'netcoreapp3.1'">
     <DefineConstants>USE_ASPNETCORE</DefineConstants>
   </PropertyGroup>
 
@@ -135,6 +135,12 @@
     <PackageReference Include="CS-Script.Core" Version="1.3.1" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' or '$(TargetFramework)' == 'netcoreapp3.1'">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <!-- https://github.com/WireMock-Net/WireMock.Net/issues/448 -->
+    <PackageReference Include="CS-Script.Core" Version="1.3.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
   </ItemGroup>

From 275dbe7a8d112c9ce0d83bf5a809cad4b15fe2e8 Mon Sep 17 00:00:00 2001
From: Anthony Iacono <anthony.iacono@willowtreeapps.com>
Date: Tue, 29 Sep 2020 13:28:32 -0400
Subject: [PATCH 2/3] Expanding NETSTANDARD check to include ASP.NET Core
 targets

---
 src/WireMock.Net/Matchers/CSharpCodeMatcher.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WireMock.Net/Matchers/CSharpCodeMatcher.cs b/src/WireMock.Net/Matchers/CSharpCodeMatcher.cs
index 8be93248d..a97c661e0 100644
--- a/src/WireMock.Net/Matchers/CSharpCodeMatcher.cs
+++ b/src/WireMock.Net/Matchers/CSharpCodeMatcher.cs
@@ -151,7 +151,7 @@ private bool IsMatch(dynamic input, string pattern)
                 throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
             }
 
-#elif (NETSTANDARD2_0 || NETSTANDARD2_1)
+#elif (NETSTANDARD2_0 || NETSTANDARD2_1 || USE_ASPNETCORE)
             dynamic script;
             try
             {

From aa7b1d064fb11ae9ed38dd443ca203e1a989afd6 Mon Sep 17 00:00:00 2001
From: Anthony Iacono <anthony.iacono@willowtreeapps.com>
Date: Wed, 30 Sep 2020 08:41:52 -0400
Subject: [PATCH 3/3] End of life netcoreapp3.0 changes and using NETCOREAPP3_1
 instead of USE_ASPNETCORE where possible

---
 .../WireMock.Net.StandAlone.csproj                        | 2 +-
 src/WireMock.Net/Http/HttpClientHelper.cs                 | 2 +-
 src/WireMock.Net/Matchers/CSharpCodeMatcher.cs            | 2 +-
 src/WireMock.Net/WireMock.Net.csproj                      | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj b/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
index 664a896dc..daee0e5a3 100644
--- a/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
+++ b/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
@@ -3,7 +3,7 @@
     <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
     <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
     <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>WireMock.Net.StandAlone</AssemblyName>
     <PackageId>WireMock.Net.StandAlone</PackageId>
diff --git a/src/WireMock.Net/Http/HttpClientHelper.cs b/src/WireMock.Net/Http/HttpClientHelper.cs
index 375f5c310..1eb163e41 100644
--- a/src/WireMock.Net/Http/HttpClientHelper.cs
+++ b/src/WireMock.Net/Http/HttpClientHelper.cs
@@ -13,7 +13,7 @@ internal static class HttpClientHelper
     {
         public static HttpClient CreateHttpClient(IProxyAndRecordSettings settings)
         {
-#if NETSTANDARD || USE_ASPNETCORE
+#if NETSTANDARD || NETCOREAPP3_1
             var handler = new HttpClientHandler
             {
                 CheckCertificateRevocationList = false,
diff --git a/src/WireMock.Net/Matchers/CSharpCodeMatcher.cs b/src/WireMock.Net/Matchers/CSharpCodeMatcher.cs
index a97c661e0..8252abdb8 100644
--- a/src/WireMock.Net/Matchers/CSharpCodeMatcher.cs
+++ b/src/WireMock.Net/Matchers/CSharpCodeMatcher.cs
@@ -151,7 +151,7 @@ private bool IsMatch(dynamic input, string pattern)
                 throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
             }
 
-#elif (NETSTANDARD2_0 || NETSTANDARD2_1 || USE_ASPNETCORE)
+#elif (NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1)
             dynamic script;
             try
             {
diff --git a/src/WireMock.Net/WireMock.Net.csproj b/src/WireMock.Net/WireMock.Net.csproj
index 64c103133..5f835b6e7 100644
--- a/src/WireMock.Net/WireMock.Net.csproj
+++ b/src/WireMock.Net/WireMock.Net.csproj
@@ -3,7 +3,7 @@
     <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
     <AssemblyTitle>WireMock.Net</AssemblyTitle>
     <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>WireMock.Net</AssemblyName>
     <PackageId>WireMock.Net</PackageId>
@@ -42,7 +42,7 @@
     <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2' or '$(TargetFramework)' == 'netcoreapp3.0' or '$(TargetFramework)' == 'netcoreapp3.1'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2' or '$(TargetFramework)' == 'netcoreapp3.1'">
     <DefineConstants>USE_ASPNETCORE</DefineConstants>
   </PropertyGroup>
 
@@ -135,10 +135,10 @@
     <PackageReference Include="CS-Script.Core" Version="1.3.1" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' or '$(TargetFramework)' == 'netcoreapp3.1'">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <!-- https://github.com/WireMock-Net/WireMock.Net/issues/448 -->
-    <PackageReference Include="CS-Script.Core" Version="1.3.1" />
+    <PackageReference Include="CS-Script.Core" Version="1.4.0" />
   </ItemGroup>
 
   <ItemGroup>