netstandard2.0 support

SpotifyAPI.Web.Auth/SpotifyAPI.Web.Auth.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
     <PackageId>SpotifyAPI.Web.Auth</PackageId>
     <Title>SpotifyAPI.Web.Auth</Title>
     <Authors>Jonas Dellinger</Authors>

SpotifyAPI.Web/Http/APIConnector.cs

@@ -212,9 +212,15 @@ namespace SpotifyAPI.Web.Http
 
     private async Task ApplyAuthenticator(IRequest request)
     {
+#if NETSTANDARD2_0
+      if (_authenticator != null
+        && !request.Endpoint.IsAbsoluteUri
+        || request.Endpoint.AbsoluteUri.Contains("https://api.spotify.com"))
+#else
       if (_authenticator != null
         && !request.Endpoint.IsAbsoluteUri
         || request.Endpoint.AbsoluteUri.Contains("https://api.spotify.com", StringComparison.InvariantCulture))
+#endif
       {
         await _authenticator.Apply(request, this).ConfigureAwait(false);
       }
@@ -267,11 +273,13 @@ namespace SpotifyAPI.Web.Http
         return;
       }
 
-      throw response.StatusCode switch
+      switch (response.StatusCode)
       {
-        HttpStatusCode.Unauthorized => new APIUnauthorizedException(response),
+        case HttpStatusCode.Unauthorized:
-        _ => new APIException(response),
+          throw new APIUnauthorizedException(response);
-      };
+        default:
+          throw new APIException(response);
+      }
     }
   }
 }

SpotifyAPI.Web/Http/NetHttpClient.cs

@@ -30,20 +30,23 @@ namespace SpotifyAPI.Web.Http
     {
       Ensure.ArgumentNotNull(request, nameof(request));
 
-      using HttpRequestMessage requestMsg = BuildRequestMessage(request);
+      using (HttpRequestMessage requestMsg = BuildRequestMessage(request))
+      {
         var responseMsg = await _httpClient
                 .SendAsync(requestMsg, HttpCompletionOption.ResponseContentRead)
                 .ConfigureAwait(false);
 
         return await BuildResponse(responseMsg).ConfigureAwait(false);
       }
+    }
 
     private static async Task<IResponse> BuildResponse(HttpResponseMessage responseMsg)
     {
       Ensure.ArgumentNotNull(responseMsg, nameof(responseMsg));
 
       // We only support text stuff for now
-      using var content = responseMsg.Content;
+      using (var content = responseMsg.Content)
+      {
         var headers = responseMsg.Headers.ToDictionary(header => header.Key, header => header.Value.First());
         var body = await responseMsg.Content.ReadAsStringAsync().ConfigureAwait(false);
         var contentType = content.Headers?.ContentType?.MediaType;
@@ -55,6 +58,7 @@ namespace SpotifyAPI.Web.Http
           Body = body
         };
       }
+    }
 
     private static HttpRequestMessage BuildRequestMessage(IRequest request)
     {

SpotifyAPI.Web/Http/SimpleHTTPLogger.cs

@@ -25,8 +25,12 @@ namespace SpotifyAPI.Web.Http
     public void OnResponse(IResponse response)
     {
       Ensure.ArgumentNotNull(response, nameof(response));
-
+#if NETSTANDARD2_0
+      string body = response.Body?.ToString().Replace("\n", "");
+#else
       string body = response.Body?.ToString().Replace("\n", "", StringComparison.InvariantCulture);
+#endif
+
       body = body?.Substring(0, Math.Min(50, body?.Length ?? 0));
       Console.WriteLine("--> {0} {1} {2}\n", response.StatusCode, response.ContentType, body);
     }

SpotifyAPI.Web/Http/SimpleRetryHandler.cs

@@ -52,7 +52,7 @@ namespace SpotifyAPI.Web.Http
 
     private static int? ParseTooManyRetriesToMs(IResponse response)
     {
-      if (response.StatusCode != HttpStatusCode.TooManyRequests)
+      if (response.StatusCode != (HttpStatusCode)429)
       {
         return null;
       }

SpotifyAPI.Web/Models/Response/Interfaces/IPlaylistElement.cs

@@ -12,6 +12,6 @@ namespace SpotifyAPI.Web
   public interface IPlayableItem
   {
     [JsonConverter(typeof(StringEnumConverter))]
-    public ItemType Type { get; }
+    ItemType Type { get; }
   }
 }

SpotifyAPI.Web/SpotifyAPI.Web.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
     <!-- <GenerateDocumentationFile>true</GenerateDocumentationFile> -->
     <PackageId>SpotifyAPI.Web</PackageId>
     <Title>SpotifyAPI.Web</Title>