VSCode Formatter - Also bumped tests to net core 3.1

SpotifyAPI.Web.Auth/AuthUtil.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 
 namespace SpotifyAPI.Web.Auth

SpotifyAPI.Web.Auth/AuthorizationCodeAuth.cs

@@ -18,13 +18,10 @@ namespace SpotifyAPI.Web.Auth
 
     public ProxyConfig ProxyConfig { get; set; }
 
-        public AuthorizationCodeAuth(string redirectUri, string serverUri, Scope scope = Scope.None, string state = "")
+    public AuthorizationCodeAuth(string redirectUri, string serverUri, Scope scope = Scope.None, string state = "") : base("code", "AuthorizationCodeAuth", redirectUri, serverUri, scope, state)
-            : base("code", "AuthorizationCodeAuth", redirectUri, serverUri, scope, state)
+    { }
-        {
-        }
 
-        public AuthorizationCodeAuth(string clientId, string secretId, string redirectUri, string serverUri, Scope scope = Scope.None, string state = "")
+    public AuthorizationCodeAuth(string clientId, string secretId, string redirectUri, string serverUri, Scope scope = Scope.None, string state = "") : this(redirectUri, serverUri, scope, state)
-            : this(redirectUri, serverUri, scope, state)
     {
       ClientId = clientId;
       SecretId = secretId;
@@ -130,7 +127,6 @@ namespace SpotifyAPI.Web.Auth
     }
 
     public AuthorizationCodeAuthController(IHttpContext context) : base(context)
-        {
+    { }
-        }
   }
 }

SpotifyAPI.Web.Auth/CredentialsAuth.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Text;
@@ -27,8 +27,7 @@ namespace SpotifyAPI.Web.Auth
       string auth = Convert.ToBase64String(Encoding.UTF8.GetBytes(ClientId + ":" + ClientSecret));
 
       List<KeyValuePair<string, string>> args = new List<KeyValuePair<string, string>>
-            {
+      {new KeyValuePair<string, string>("grant_type", "client_credentials")
-                new KeyValuePair<string, string>("grant_type", "client_credentials")
       };
 
       HttpClientHandler handler = ProxyConfig.CreateClientHandler(ProxyConfig);

SpotifyAPI.Web.Auth/ImplicitGrantAuth.cs

@@ -9,8 +9,7 @@ namespace SpotifyAPI.Web.Auth
 {
   public class ImplicitGrantAuth : SpotifyAuthServer<Token>
   {
-        public ImplicitGrantAuth(string clientId, string redirectUri, string serverUri, Scope scope = Scope.None, string state = "") :
+    public ImplicitGrantAuth(string clientId, string redirectUri, string serverUri, Scope scope = Scope.None, string state = "") : base("token", "ImplicitGrantAuth", redirectUri, serverUri, scope, state)
-            base("token", "ImplicitGrantAuth", redirectUri, serverUri, scope, state)
     {
       ClientId = clientId;
     }
@@ -59,7 +58,6 @@ namespace SpotifyAPI.Web.Auth
     }
 
     public ImplicitGrantAuthController(IHttpContext context) : base(context)
-        {
+    { }
-        }
   }
 }

SpotifyAPI.Web.Auth/SpotifyAuthServer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;

SpotifyAPI.Web.Auth/TokenSwapAuth.cs

@@ -1,14 +1,14 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 using SpotifyAPI.Web.Enums;
+using SpotifyAPI.Web.Models;
 using Unosquare.Labs.EmbedIO;
 using Unosquare.Labs.EmbedIO.Constants;
 using Unosquare.Labs.EmbedIO.Modules;
-using SpotifyAPI.Web.Models;
-using Newtonsoft.Json;
-using System.Net.Http;
 
 namespace SpotifyAPI.Web.Auth
 {
@@ -91,10 +91,9 @@ namespace SpotifyAPI.Web.Auth
       int currentRetries = 0)
     {
       FormUrlEncodedContent content = new FormUrlEncodedContent(new Dictionary<string, string>
-            {
+      { { "grant_type", grantType },
-                {"grant_type", grantType},
+        { "code", authorizationCode },
-                {"code", authorizationCode},
+        { "refresh_token", refreshToken }
-                {"refresh_token", refreshToken}
       });
 
       try
@@ -111,8 +110,7 @@ namespace SpotifyAPI.Web.Auth
         }
       }
       catch
-            {
+      { }
-            }
 
       if (currentRetries >= MaxGetTokenRetries)
       {
@@ -165,7 +163,7 @@ namespace SpotifyAPI.Web.Auth
     /// <returns></returns>
     public async Task<Token> ExchangeCodeAsync(string authorizationCode)
     {
-            Token token = await GetToken("authorization_code", authorizationCode: authorizationCode);
+      Token token = await GetToken("authorization_code", authorizationCode : authorizationCode);
       if (token != null && !token.HasError() && !string.IsNullOrEmpty(token.AccessToken))
       {
         SetAccessExpireTimer(token);
@@ -181,7 +179,7 @@ namespace SpotifyAPI.Web.Auth
     /// <returns></returns>
     public async Task<Token> RefreshAuthAsync(string refreshToken)
     {
-            Token token = await GetToken("refresh_token", refreshToken: refreshToken);
+      Token token = await GetToken("refresh_token", refreshToken : refreshToken);
       if (token != null && !token.HasError() && !string.IsNullOrEmpty(token.AccessToken))
       {
         SetAccessExpireTimer(token);
@@ -194,8 +192,7 @@ namespace SpotifyAPI.Web.Auth
   internal class TokenSwapAuthController : WebApiController
   {
     public TokenSwapAuthController(IHttpContext context) : base(context)
-        {
+    { }
-        }
 
     [WebApiHandler(HttpVerbs.Get, "/auth")]
     public Task<bool> GetAuth()

SpotifyAPI.Web.Auth/TokenSwapWebAPIFactory.cs

@@ -1,9 +1,9 @@
-using SpotifyAPI.Web.Enums;
-using SpotifyAPI.Web.Models;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
+using SpotifyAPI.Web.Enums;
+using SpotifyAPI.Web.Models;
 
 namespace SpotifyAPI.Web.Auth
 {
@@ -69,7 +69,7 @@ namespace SpotifyAPI.Web.Auth
       HostServerUri = hostServerUri;
       OpenBrowser = openBrowser;
 
-            OnAccessTokenExpired += async (sender, e) =>
+      OnAccessTokenExpired += async(sender, e) =>
       {
         if (AutoRefresh)
         {
@@ -127,8 +127,7 @@ namespace SpotifyAPI.Web.Auth
       public static new AccessTokenExpiredEventArgs Empty { get; } = new AccessTokenExpiredEventArgs();
 
       public AccessTokenExpiredEventArgs()
-            {
+      { }
-            }
     }
     /// <summary>
     /// When the authorization from Spotify expires. This will only occur if <see cref="AutoRefresh"/> is true.
@@ -140,8 +139,7 @@ namespace SpotifyAPI.Web.Auth
       public static new AuthSuccessEventArgs Empty { get; } = new AuthSuccessEventArgs();
 
       public AuthSuccessEventArgs()
-            {
+      { }
-            }
     }
     /// <summary>
     /// When an authorization attempt succeeds and gains authorization.
@@ -202,7 +200,7 @@ namespace SpotifyAPI.Web.Auth
           MaxGetTokenRetries = MaxGetTokenRetries,
           TimeAccessExpiry = AutoRefresh || TimeAccessExpiry
         };
-                lastAuth.AuthReceived += async (sender, response) =>
+        lastAuth.AuthReceived += async(sender, response) =>
         {
           if (!string.IsNullOrEmpty(response.Error) || string.IsNullOrEmpty(response.Code))
           {
@@ -241,7 +239,7 @@ namespace SpotifyAPI.Web.Auth
           OnAuthSuccess?.Invoke(this, AuthSuccessEventArgs.Empty);
           currentlyAuthorizing = false;
         };
-                lastAuth.OnAccessTokenExpired += async (sender, e) =>
+        lastAuth.OnAccessTokenExpired += async(sender, e) =>
         {
           if (TimeAccessExpiry)
           {
@@ -267,7 +265,7 @@ namespace SpotifyAPI.Web.Auth
           Interval = Timeout * 1000
         };
 
-                while (currentlyAuthorizing && webApiTimeoutTimer.Enabled) ;
+        while (currentlyAuthorizing && webApiTimeoutTimer.Enabled);
 
         // If a timeout occurred
         if (lastWebApi == null && currentlyAuthorizing)

SpotifyAPI.Web.Examples.ASP/Controllers/HomeController.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;

SpotifyAPI.Web.Examples.ASP/Startup.cs

@@ -26,7 +26,7 @@ namespace SpotifyAPI.Web.Examples.ASP
         .AddCookie()
         .AddSpotify(options =>
         {
-                    var scopes = Scope.UserLibraryRead;
+          var scopes = Scope.UserLibraryRead | Scope.UserModifyPlaybackState;
           options.Scope.Add(scopes.GetStringAttribute(","));
 
           options.SaveTokens = true;

SpotifyAPI.Web.Examples.CLI/Program.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using SpotifyAPI.Web.Auth;
 using SpotifyAPI.Web.Enums;
@@ -14,13 +14,13 @@ namespace SpotifyAPI.Web.Examples.CLI
     // ReSharper disable once UnusedParameter.Local
     public static void Main(string[] args)
     {
-            _clientId = string.IsNullOrEmpty(_clientId)
+      _clientId = string.IsNullOrEmpty(_clientId) ?
-                ? Environment.GetEnvironmentVariable("SPOTIFY_CLIENT_ID")
+        Environment.GetEnvironmentVariable("SPOTIFY_CLIENT_ID") :
-                : _clientId;
+        _clientId;
 
-            _secretId = string.IsNullOrEmpty(_secretId)
+      _secretId = string.IsNullOrEmpty(_secretId) ?
-                ? Environment.GetEnvironmentVariable("SPOTIFY_SECRET_ID")
+        Environment.GetEnvironmentVariable("SPOTIFY_SECRET_ID") :
-                : _secretId;
+        _secretId;
 
       Console.WriteLine("####### Spotify API Example #######");
       Console.WriteLine("This example uses AuthorizationCodeAuth.");
@@ -37,8 +37,6 @@ namespace SpotifyAPI.Web.Examples.CLI
       Console.ReadLine();
       auth.Stop(0);
 
-            
-
     }
 
     private static async void AuthOnAuthReceived(object sender, AuthorizationCode payload)
@@ -60,7 +58,7 @@ namespace SpotifyAPI.Web.Examples.CLI
       if (playlists.Items == null) return;
 
       playlists.Items.ForEach(playlist => Console.WriteLine($"- {playlist.Name}"));
-            if(playlists.HasNextPage())
+      if (playlists.HasNextPage())
         await PrintAllPlaylistTracks(api, await api.GetNextPageAsync(playlists));
     }
 

SpotifyAPI.Web.Tests/ProxyConfigTest.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 
 namespace SpotifyAPI.Web.Tests

SpotifyAPI.Web.Tests/SpotifyAPI.Web.Tests.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
-
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

SpotifyAPI.Web.Tests/SpotifyWebAPITest.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -67,7 +67,6 @@ namespace SpotifyAPI.Web.Tests
       _mock.Setup(client => client.DownloadJson<PublicProfile>(It.IsAny<string>(), It.IsAny<Dictionary<string, string>>()))
         .Returns(new Tuple<ResponseInfo, PublicProfile>(ResponseInfo.Empty, profile));
 
-
       _spotify.UseAuth = false;
       Assert.AreEqual(profile, _spotify.GetPublicProfile("wizzler"));
       _mock.Verify(client => client.DownloadJson<PublicProfile>(

SpotifyAPI.Web.Tests/UtilTest.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 
 namespace SpotifyAPI.Web.Tests

SpotifyAPI.Web/Enums/AlbumType.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace SpotifyAPI.Web.Enums
 {

SpotifyAPI.Web/Enums/FollowType.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace SpotifyAPI.Web.Enums
 {

SpotifyAPI.Web/Enums/RepeatState.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace SpotifyAPI.Web.Enums
 {

SpotifyAPI.Web/Enums/Scope.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace SpotifyAPI.Web.Enums
 {

SpotifyAPI.Web/Enums/SearchType.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace SpotifyAPI.Web.Enums
 {

SpotifyAPI.Web/Enums/TimeRangeType.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace SpotifyAPI.Web.Enums
 {

SpotifyAPI.Web/Enums/TrackType.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace SpotifyAPI.Web.Enums
 {

SpotifyAPI.Web/IClient.cs

@@ -1,7 +1,7 @@
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 using SpotifyAPI.Web.Models;
 
 namespace SpotifyAPI.Web

SpotifyAPI.Web/Models/AnalysisMeta.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/AnalysisSection.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/AnalysisSegment.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/AnalysisTimeSlice.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/AnalysisTrack.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/ArrayResponse.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/AudioAnalysis.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/AudioFeatures.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/AvailabeDevices.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models

SpotifyAPI.Web/Models/BasicModel.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Net;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/Category.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/CategoryList.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/CategoryPlaylist.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/CursorPaging.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/Device.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/FeaturedPlaylists.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/FollowedArtists.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/FullAlbum.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/FullArtist.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/FullPlaylist.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/FullTrack.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/GeneralModels.cs

@@ -1,7 +1,7 @@
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {
@@ -18,8 +18,7 @@ namespace SpotifyAPI.Web.Models
   }
 
   public class ErrorResponse : BasicModel
-    {
+  { }
-    }
 
   public class Error
   {

SpotifyAPI.Web/Models/NewAlbumReleases.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/Paging.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/PlayHistory.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models

SpotifyAPI.Web/Models/PlaybackContext.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using SpotifyAPI.Web.Enums;
 

SpotifyAPI.Web/Models/PrivateProfile.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/PublicProfile.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/RecommendationSeed .cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/RecommendationSeedGenres.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models

SpotifyAPI.Web/Models/Recommendations.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models

SpotifyAPI.Web/Models/ResponseInfo.cs

@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/SearchItem.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/SeveralAlbums.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models

SpotifyAPI.Web/Models/SeveralAudioFeatures.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models

SpotifyAPI.Web/Models/SeveralTracks.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models

SpotifyAPI.Web/Models/SimpleAlbum.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/SimpleArtist.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/SimplePlaylist.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/SimpleTrack.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/Snapshot.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/Token.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
 using System;
+using Newtonsoft.Json;
 
 namespace SpotifyAPI.Web.Models
 {

SpotifyAPI.Web/Models/TuneableTrack.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Reflection;
 
@@ -55,11 +55,11 @@ namespace SpotifyAPI.Web.Models
       {
         object value = info.GetValue(this);
         string name = info.GetCustomAttribute<StringAttribute>()?.Text;
-                if(name == null || value == null)
+        if (name == null || value == null)
           continue;
-                urlParams.Add(value is float valueAsFloat
+        urlParams.Add(value is float valueAsFloat ?
-                    ? $"{prefix}_{name}={valueAsFloat.ToString(CultureInfo.InvariantCulture)}"
+          $"{prefix}_{name}={valueAsFloat.ToString(CultureInfo.InvariantCulture)}" :
-                    : $"{prefix}_{name}={value}");
+          $"{prefix}_{name}={value}");
       }
       if (urlParams.Count > 0)
         return "&" + string.Join("&", urlParams);

SpotifyAPI.Web/ProxyConfig.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net;
 using System.Net.Http;
 

SpotifyAPI.Web/SpotifyWebBuilder.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

SpotifyAPI.Web/SpotifyWebClient.cs

@@ -1,4 +1,3 @@
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Net;
@@ -6,6 +5,7 @@ using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
 using SpotifyAPI.Web.Models;
 
 namespace SpotifyAPI.Web
@@ -42,7 +42,7 @@ namespace SpotifyAPI.Web
       {
         AddHeaders(headers);
       }
-            using (HttpResponseMessage response = Task.Run(() => _client.GetAsync(url)).Result)
+      using(HttpResponseMessage response = Task.Run(() => _client.GetAsync(url)).Result)
       {
         return new Tuple<ResponseInfo, byte[]>(new ResponseInfo
         {
@@ -58,7 +58,7 @@ namespace SpotifyAPI.Web
       {
         AddHeaders(headers);
       }
-            using (HttpResponseMessage response = await _client.GetAsync(url).ConfigureAwait(false))
+      using(HttpResponseMessage response = await _client.GetAsync(url).ConfigureAwait(false))
       {
         return new Tuple<ResponseInfo, byte[]>(new ResponseInfo
         {
@@ -83,7 +83,8 @@ namespace SpotifyAPI.Web
 
     public async Task<Tuple<ResponseInfo, T>> DownloadJsonAsync<T>(string url, Dictionary<string, string> headers = null)
     {
-            Tuple<ResponseInfo, string> response = await DownloadAsync(url, headers).ConfigureAwait(false);try
+      Tuple<ResponseInfo, string> response = await DownloadAsync(url, headers).ConfigureAwait(false);
+      try
       {
         return new Tuple<ResponseInfo, T>(response.Item1, JsonConvert.DeserializeObject<T>(response.Item2, JsonSettings));
       }
@@ -116,7 +117,7 @@ namespace SpotifyAPI.Web
       {
         Content = new StringContent(body, _encoding)
       };
-            using (HttpResponseMessage response = Task.Run(() => _client.SendAsync(message)).Result)
+      using(HttpResponseMessage response = Task.Run(() => _client.SendAsync(message)).Result)
       {
         return new Tuple<ResponseInfo, byte[]>(new ResponseInfo
         {
@@ -137,7 +138,7 @@ namespace SpotifyAPI.Web
       {
         Content = new StringContent(body, _encoding)
       };
-            using (HttpResponseMessage response = await _client.SendAsync(message))
+      using(HttpResponseMessage response = await _client.SendAsync(message))
       {
         return new Tuple<ResponseInfo, byte[]>(new ResponseInfo
         {
@@ -192,7 +193,7 @@ namespace SpotifyAPI.Web
       return newHeaders;
     }
 
-        private void AddHeaders(Dictionary<string,string> headers)
+    private void AddHeaders(Dictionary<string, string> headers)
     {
       _client.DefaultRequestHeaders.Clear();
       foreach (KeyValuePair<string, string> headerPair in headers)

SpotifyAPI.Web/Util.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -9,13 +9,13 @@ namespace SpotifyAPI.Web
   {
     public static string GetStringAttribute<T>(this T en, string separator = "") where T : struct, IConvertible
     {
-            Enum e = (Enum)(object)en;
+      Enum e = (Enum) (object) en;
       IEnumerable<StringAttribute> attributes =
         Enum.GetValues(typeof(T))
         .Cast<T>()
-            .Where(v => e.HasFlag((Enum)(object)v))
+        .Where(v => e.HasFlag((Enum) (object) v))
         .Select(v => typeof(T).GetField(v.ToString(CultureInfo.InvariantCulture)))
-            .Select(f => f.GetCustomAttributes(typeof(StringAttribute), false)[0])
+        .Select(f => f.GetCustomAttributes(typeof(StringAttribute), false) [0])
         .Cast<StringAttribute>();
 
       List<string> list = new List<string>();
@@ -25,7 +25,7 @@ namespace SpotifyAPI.Web
 
     public static long ToUnixTimeMillisecondsPoly(this DateTime time)
     {
-            return (long)time.Subtract(new DateTime(1970, 1, 1)).TotalMilliseconds;
+      return (long) time.Subtract(new DateTime(1970, 1, 1)).TotalMilliseconds;
     }
   }