Clean-up of VisualStudio warnings from latest C# language features

e13tech · May 4, 2021 · 289075a · 289075a
1 parent b0de716
commit 289075a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/E13.Common.Nunit.Api/BaseApiFixture.cs b/src/E13.Common.Nunit.Api/BaseApiFixture.cs
@@ -9,8 +9,8 @@ namespace E13.Common.Nunit.Api
 {
     public class BaseApiFixture : LaunchSettingsFixture
     {
-        private TestServer Server { get; set; }
-        private string BaseUrl { get; }
+        private TestServer? Server { get; set; }
+        private string? BaseUrl { get; }
         private string ProjectName { get; }
         private Func<IWebHostBuilder> BuilderFunc { get; }
 
@@ -21,9 +21,9 @@ public BaseApiFixture(string projectName, Func<IWebHostBuilder> builderFunc)
             BuilderFunc = builderFunc;
         }
 
-        private static HttpClient _singleton;
+        private static HttpClient? _singleton;
 
-        public HttpClient GetHttpClient()
+        public HttpClient? GetHttpClient()
         {
             // only init a single HttpClient
             if (_singleton != null)
@@ -39,7 +39,7 @@ public HttpClient GetHttpClient()
                 Directory.GetCurrentDirectory().ParentSiblingDirectory(ProjectName),
                 BuilderFunc());
 
-            _singleton = Server.CreateClient();
+            _singleton = Server?.CreateClient();
 
             return _singleton;
         }

diff --git a/src/E13.Common.Nunit.Api/Extensions/HttpClientExtensions.cs b/src/E13.Common.Nunit.Api/Extensions/HttpClientExtensions.cs
@@ -7,8 +7,8 @@ namespace System.Net.Http
 {
     public static class HttpClientExtensions
     {
-        private static readonly string TestUser = Environment.GetEnvironmentVariable("TokenForAAD_TestUser");
-        private static readonly string TestPass = Environment.GetEnvironmentVariable("TokenForAAD_TestPass");
+        private static readonly string? TestUser = Environment.GetEnvironmentVariable("TokenForAAD_TestUser");
+        private static readonly string? TestPass = Environment.GetEnvironmentVariable("TokenForAAD_TestPass");
 
 #pragma warning disable CA1707 // Identifiers should not contain underscores - this is an exception because it is used primarily in unit tests
         public static void TokenForAAD_TestEnabled(this HttpClient client, string[] apiScopes)