#1 | ADDED: .NET 5.0 as one of Targets.

TitanShark · Nov 23, 2020 · 10b7759 · 10b7759
1 parent 107b992
commit 10b7759
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 17 deletions.
diff --git a/TitanShark.Thresher.Core.Tests/InterceptorTests.cs b/TitanShark.Thresher.Core.Tests/InterceptorTests.cs
@@ -47,13 +47,13 @@ public async Task Single_Interceptor_Sequential_Runner()
         [Fact]
         public Task Multiple_Interceptors_Sequential_Runner_DefaultJsonRecordSerializer()
         {
-            return RunMultipleInterceptors(interceptors => new SequentialInterceptorsRunner(interceptors));
+            return RunMultipleInterceptors(interceptors => new SequentialInterceptorsRunner(interceptors), new SystemJsonRecordSerializer());
         }
 
         [Fact]
         public Task Multiple_Interceptors_Parallel_Runner_DefaultJsonRecordSerializer()
         {
-            return RunMultipleInterceptors(interceptors => new ParallelInterceptorsRunner(interceptors));
+            return RunMultipleInterceptors(interceptors => new ParallelInterceptorsRunner(interceptors), new SystemJsonRecordSerializer());
         }
 
         [Fact]
@@ -68,13 +68,13 @@ public Task Multiple_Interceptors_Parallel_Runner_NewtonsoftJsonRecordSerializer
             return RunMultipleInterceptors(interceptors => new ParallelInterceptorsRunner(interceptors), new NewtonsoftJsonRecordSerializer());
         }
 
-        private async Task RunMultipleInterceptors(Func<IInterceptor[], InterceptorsRunner> runnerCreator, IRecordSerializer<string> serializer = null)
+        private static async Task RunMultipleInterceptors(Func<IInterceptor[], InterceptorsRunner> runnerCreator, IRecordSerializer<string> serializer)
         {
             // prepares
-            var persistenceOne = new InMemoryRecordsPersistence(/*new NewtonsoftJsonRecordSerializer()*/);
+            var persistenceOne = new InMemoryRecordsPersistence(serializer);
             var recorderOne = new Recorder(persistenceOne);
 
-            var persistenceTwo = new InMemoryRecordsPersistence(/*new NewtonsoftJsonRecordSerializer()*/);
+            var persistenceTwo = new InMemoryRecordsPersistence(serializer);
             var recorderTwo = new Recorder(persistenceTwo);
 
             var handler = new InterceptableHttpClientHandler(interceptorsRunner: runnerCreator(new[] { recorderOne, recorderTwo }));

diff --git a/TitanShark.Thresher.Core.Tests/TitanShark.Thresher.Core.Tests.csproj b/TitanShark.Thresher.Core.Tests/TitanShark.Thresher.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/TitanShark.Thresher.Core/TitanShark.Thresher.Core.csproj b/TitanShark.Thresher.Core/TitanShark.Thresher.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net462;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/TitanShark.Thresher.Core/_Fundamentals/Transmitter.cs b/TitanShark.Thresher.Core/_Fundamentals/Transmitter.cs
@@ -11,12 +11,7 @@ public class Transmitter
 
         public Transmitter(Func<CallId, HttpRequestMessage, CancellationToken, Task<HttpResponseMessage>> sendFunction)
         {
-            if (sendFunction == null)
-            {
-                throw new ArgumentNullException(nameof(sendFunction));
-            }
-
-            SendFunction = sendFunction;
+            SendFunction = sendFunction ?? throw new ArgumentNullException(nameof(sendFunction));
         }
     }
 }
diff --git a/TitanShark.Thresher.Core/_Recording/HttpRequestMessageExtensions.cs b/TitanShark.Thresher.Core/_Recording/HttpRequestMessageExtensions.cs
@@ -11,7 +11,12 @@ public static async Task<RecordableRequest> ToRecordable(this HttpRequestMessage
             {
                 Headers = request.Headers,
                 Method = request.Method,
+#if NET5_0
+                Options = request.Options,
+                VersionPolicy = request.VersionPolicy,
+#else
                 Properties = request.Properties,
+#endif
                 RequestUri = request.RequestUri,
                 Version = request.Version
             };

diff --git a/TitanShark.Thresher.Core/_Recording/HttpResponseMessageExtensions.cs b/TitanShark.Thresher.Core/_Recording/HttpResponseMessageExtensions.cs
@@ -14,7 +14,10 @@ public static async Task<RecordableResponse> ToRecordable(this HttpResponseMessa
                 ReasonPhrase = response.ReasonPhrase,
                 RequestMessage = response.RequestMessage,
                 StatusCode = response.StatusCode,
-                Version = response.Version
+                Version = response.Version,
+#if NET5_0
+                TrailingHeaders = response.TrailingHeaders
+#endif
             };
 
             var content = response.Content;

diff --git a/TitanShark.Thresher.Core/_Recording/RecordableRequest.cs b/TitanShark.Thresher.Core/_Recording/RecordableRequest.cs
@@ -12,9 +12,15 @@ public class RecordableRequest
         public HttpRequestHeaders Headers { get; set; }
 
         public HttpMethod Method { get; set; }
-
-        public IDictionary<string, object> Properties { get; set;  }
-
+
+#if NET5_0
+        public HttpRequestOptions Options { get; set;  }
+
+        public HttpVersionPolicy VersionPolicy { get; set; }
+#else
+        public IDictionary<string, object> Properties { get; set; }
+#endif
+
         public Uri RequestUri { get; set; }
 
         public Version Version { get; set; }

diff --git a/TitanShark.Thresher.Core/_Recording/RecordableResponse.cs b/TitanShark.Thresher.Core/_Recording/RecordableResponse.cs
@@ -20,5 +20,9 @@ public class RecordableResponse
         public HttpStatusCode StatusCode { get; set; }
 
         public Version Version { get; set; }
+
+#if NET5_0
+        public HttpHeaders TrailingHeaders { get; set; }
+#endif
     }
 }