Target .NET5.0

JSkimming · JSkimming · commit d70ac0a2c8cc · 2020-12-26T10:51:45.000Z
diff --git a/src/Tesla.NET/Models/Internal/ResponseDataWrapper.cs b/src/Tesla.NET/Models/Internal/ResponseDataWrapper.cs
@@ -17,7 +17,7 @@ public class ResponseDataWrapper<TResponse> : IResponseDataWrapper<TResponse>
         /// Initializes a new instance of the <see cref="ResponseDataWrapper{TResponse}"/> class.
         /// </summary>
         /// <param name="response">The <see cref="Response"/> object.</param>
-        public ResponseDataWrapper(TResponse response = default)
+        public ResponseDataWrapper(TResponse response)
         {
             Response = response;
         }
diff --git a/src/Tesla.NET/Properties/AssemblyInfo.cs b/src/Tesla.NET/Properties/AssemblyInfo.cs
@@ -7,17 +7,13 @@
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-#if NET45
-[assembly: AssemblyTitle("Tesla.NET .NET Framework")]
-#else
-[assembly: AssemblyTitle("Tesla.NET .NET Standard")]
-#endif
+[assembly: AssemblyTitle("Tesla.NET")]
 
 [assembly: AssemblyDescription("A .NET client library for the Tesla Owner API.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Tesla.NET")]
-[assembly: AssemblyCopyright("Copyright © 2018 James Skimming")]
+[assembly: AssemblyCopyright("Copyright © 2018-2021 James Skimming")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/src/Tesla.NET/Requests/HttpClientExtensions.cs b/src/Tesla.NET/Requests/HttpClientExtensions.cs
@@ -58,20 +58,20 @@ public static Task<IMessageResponse<IAccessTokenResponse>> RequestAccessTokenAsy
                 throw new ArgumentNullException(nameof(password));
 
             Uri requestUri = new Uri(baseUri, "oauth/token");
-            IEnumerable<KeyValuePair<string, string>> parameters = GetRequestAccessTokenParameters();
+            IEnumerable<KeyValuePair<string?, string?>> parameters = GetRequestAccessTokenParameters();
 
             return
                 client
                     .PostFormAsync(requestUri, parameters, cancellationToken: cancellationToken)
                     .ReadJsonAsAsync<IAccessTokenResponse, AccessTokenResponse>(cancellationToken);
 
-            IEnumerable<KeyValuePair<string, string>> GetRequestAccessTokenParameters()
+            IEnumerable<KeyValuePair<string?, string?>> GetRequestAccessTokenParameters()
             {
-                yield return new KeyValuePair<string, string>("grant_type", "password");
-                yield return new KeyValuePair<string, string>("client_id", clientId);
-                yield return new KeyValuePair<string, string>("client_secret", clientSecret);
-                yield return new KeyValuePair<string, string>("email", email);
-                yield return new KeyValuePair<string, string>("password", password);
+                yield return new KeyValuePair<string?, string?>("grant_type", "password");
+                yield return new KeyValuePair<string?, string?>("client_id", clientId);
+                yield return new KeyValuePair<string?, string?>("client_secret", clientSecret);
+                yield return new KeyValuePair<string?, string?>("email", email);
+                yield return new KeyValuePair<string?, string?>("password", password);
             }
         }
 
@@ -106,19 +106,19 @@ public static Task<IMessageResponse<IAccessTokenResponse>> RefreshAccessTokenAsy
                 throw new ArgumentNullException(nameof(refreshToken));
 
             Uri requestUri = new Uri(baseUri, "oauth/token");
-            IEnumerable<KeyValuePair<string, string>> parameters = GetRefreshAccessTokenParameters();
+            IEnumerable<KeyValuePair<string?, string?>> parameters = GetRefreshAccessTokenParameters();
 
             return
                 client
                     .PostFormAsync(requestUri, parameters, cancellationToken: cancellationToken)
                     .ReadJsonAsAsync<IAccessTokenResponse, AccessTokenResponse>(cancellationToken);
 
-            IEnumerable<KeyValuePair<string, string>> GetRefreshAccessTokenParameters()
+            IEnumerable<KeyValuePair<string?, string?>> GetRefreshAccessTokenParameters()
             {
-                yield return new KeyValuePair<string, string>("grant_type", "refresh_token");
-                yield return new KeyValuePair<string, string>("client_id", clientId);
-                yield return new KeyValuePair<string, string>("client_secret", clientSecret);
-                yield return new KeyValuePair<string, string>("refresh_token", refreshToken);
+                yield return new KeyValuePair<string?, string?>("grant_type", "refresh_token");
+                yield return new KeyValuePair<string?, string?>("client_id", clientId);
+                yield return new KeyValuePair<string?, string?>("client_secret", clientSecret);
+                yield return new KeyValuePair<string?, string?>("refresh_token", refreshToken);
             }
         }
 
@@ -146,16 +146,16 @@ public static Task<IMessageResponse<object>> RevokeAccessTokenAsync(
 
             Uri requestUri = new Uri(baseUri, "oauth/revoke");
 
-            IEnumerable<KeyValuePair<string, string>> parameters = GetRevokeAccessTokenParameters();
+            IEnumerable<KeyValuePair<string?, string?>> parameters = GetRevokeAccessTokenParameters();
 
             return
                 client
                     .PostFormAsync(requestUri, parameters, accessToken, cancellationToken)
                     .ReadJsonAsAsync<object, object>(cancellationToken);
 
-            IEnumerable<KeyValuePair<string, string>> GetRevokeAccessTokenParameters()
+            IEnumerable<KeyValuePair<string?, string?>> GetRevokeAccessTokenParameters()
             {
-                yield return new KeyValuePair<string, string>("token", accessToken);
+                yield return new KeyValuePair<string?, string?>("token", accessToken);
             }
         }
 
@@ -318,7 +318,7 @@ public static Task<IMessageResponse<IResponseDataWrapper<IVehicleState>>> GetVeh
         private static async Task<HttpResponseMessage> PostFormAsync(
             this HttpClient client,
             Uri requestUri,
-            IEnumerable<KeyValuePair<string, string>> parameters,
+            IEnumerable<KeyValuePair<string?, string?>> parameters,
             string? accessToken = null,
             CancellationToken cancellationToken = default)
         {
@@ -497,7 +497,7 @@ private static bool IsContentJson(HttpResponseMessage responseMessage)
             if (responseMessage == null)
                 throw new ArgumentNullException(nameof(responseMessage));
 
-            string? mediaType = responseMessage.Content?.Headers.ContentType.MediaType;
+            string? mediaType = responseMessage.Content.Headers.ContentType?.MediaType;
             return string.Equals(mediaType, "application/json", StringComparison.OrdinalIgnoreCase);
         }
 
diff --git a/src/Tesla.NET/Tesla.NET.csproj b/src/Tesla.NET/Tesla.NET.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFramework>net5.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -19,31 +19,18 @@
     <PackageTags>tesla tesla-api dotnet dotnet-core</PackageTags>
   </PropertyGroup>
 
-  <!--
-  Force the net45 build to generate non Portable PDB until such time that OpenCover supports Portable PDBs
-  https://github.com/OpenCover/opencover/issues/610
-  -->
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <DebugType>pdbonly</DebugType>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.312">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <AdditionalFiles Include="..\stylecop.json" Link="stylecop.json" />
   </ItemGroup>
diff --git a/test/Tesla.NET.Tests/GetChargeStateTests.cs b/test/Tesla.NET.Tests/GetChargeStateTests.cs
@@ -73,8 +73,8 @@ public async Task Should_set_the_bearer_token_with_the_specified_access_token()
             await Sut.GetChargeStateAsync(_vehicleId, AccessToken).ConfigureAwait(false);
 
             // Assert
-            Handler.Request.Headers.Authorization.Scheme.Should().Be("Bearer");
-            Handler.Request.Headers.Authorization.Parameter.Should().Be(AccessToken);
+            Handler.Request.Headers.Authorization?.Scheme.Should().Be("Bearer");
+            Handler.Request.Headers.Authorization?.Parameter.Should().Be(AccessToken);
         }
 
         [Fact]
diff --git a/test/Tesla.NET.Tests/GetDriveStateTests.cs b/test/Tesla.NET.Tests/GetDriveStateTests.cs
@@ -73,8 +73,8 @@ public async Task Should_set_the_bearer_token_with_the_specified_access_token()
             await Sut.GetDriveStateAsync(_vehicleId, AccessToken).ConfigureAwait(false);
 
             // Assert
-            Handler.Request.Headers.Authorization.Scheme.Should().Be("Bearer");
-            Handler.Request.Headers.Authorization.Parameter.Should().Be(AccessToken);
+            Handler.Request.Headers.Authorization?.Scheme.Should().Be("Bearer");
+            Handler.Request.Headers.Authorization?.Parameter.Should().Be(AccessToken);
         }
 
         [Fact]
diff --git a/test/Tesla.NET.Tests/GetVehicleStateTests.cs b/test/Tesla.NET.Tests/GetVehicleStateTests.cs
@@ -73,8 +73,8 @@ public async Task Should_set_the_bearer_token_with_the_specified_access_token()
             await Sut.GetVehicleStateAsync(_vehicleId, AccessToken).ConfigureAwait(false);
 
             // Assert
-            Handler.Request.Headers.Authorization.Scheme.Should().Be("Bearer");
-            Handler.Request.Headers.Authorization.Parameter.Should().Be(AccessToken);
+            Handler.Request.Headers.Authorization?.Scheme.Should().Be("Bearer");
+            Handler.Request.Headers.Authorization?.Parameter.Should().Be(AccessToken);
         }
 
         [Fact]
diff --git a/test/Tesla.NET.Tests/GetVehiclesTests.cs b/test/Tesla.NET.Tests/GetVehiclesTests.cs
@@ -71,8 +71,8 @@ public async Task Should_set_the_bearer_token_with_the_specified_access_token()
             await Sut.GetVehiclesAsync(AccessToken).ConfigureAwait(false);
 
             // Assert
-            Handler.Request.Headers.Authorization.Scheme.Should().Be("Bearer");
-            Handler.Request.Headers.Authorization.Parameter.Should().Be(AccessToken);
+            Handler.Request.Headers.Authorization?.Scheme.Should().Be("Bearer");
+            Handler.Request.Headers.Authorization?.Parameter.Should().Be(AccessToken);
         }
 
         [Fact]
diff --git a/test/Tesla.NET.Tests/HttpHandlers/TestHttpHandler.cs b/test/Tesla.NET.Tests/HttpHandlers/TestHttpHandler.cs
@@ -177,7 +177,7 @@ protected override async Task<HttpResponseMessage> SendAsync(
             return responseMessage;
         }
 
-        private static async Task<string?> GetStringContent(HttpContent content)
+        private static async Task<string?> GetStringContent(HttpContent? content)
         {
             if (content is null)
                 return null;
diff --git a/test/Tesla.NET.Tests/RevokeAccessTokenTests.cs b/test/Tesla.NET.Tests/RevokeAccessTokenTests.cs
@@ -60,8 +60,8 @@ public async Task Should_set_the_bearer_token_with_the_specified_access_token()
             await Sut.RevokeAccessTokenAsync(_accessToken).ConfigureAwait(false);
 
             // Assert
-            Handler.Request.Headers.Authorization.Scheme.Should().Be("Bearer");
-            Handler.Request.Headers.Authorization.Parameter.Should().Be(_accessToken);
+            Handler.Request.Headers.Authorization?.Scheme.Should().Be("Bearer");
+            Handler.Request.Headers.Authorization?.Parameter.Should().Be(_accessToken);
         }
 
         [Fact]
diff --git a/test/Tesla.NET.Tests/Tesla.NET.Tests.csproj b/test/Tesla.NET.Tests/Tesla.NET.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>Tesla.NET</RootNamespace>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <LangVersion>latest</LangVersion>
@@ -25,7 +25,7 @@
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="Moq" Version="4.15.2" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.113">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.312">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/test/Tesla.NET.Tests/TeslaClientMessageHandlerPipelineTests.cs b/test/Tesla.NET.Tests/TeslaClientMessageHandlerPipelineTests.cs
@@ -43,7 +43,7 @@ public void Should_create_a_chain_of_delegates()
             foreach (DelegatingHandler handler in _handlers)
             {
                 current.Should().BeSameAs(handler);
-                current = handler.InnerHandler;
+                current = handler.InnerHandler!;
             }
         }
 
@@ -58,7 +58,7 @@ public void Should_end_the_chain_with_a_HttpClientHandler()
             DelegatingHandler? @delegate;
             while ((@delegate = current as DelegatingHandler) != null)
             {
-                current = @delegate.InnerHandler;
+                current = @delegate.InnerHandler!;
             }
 
             current.Should().BeOfType<HttpClientHandler>();
@@ -99,7 +99,7 @@ public void Should_create_a_chain_of_delegates()
             foreach (DelegatingHandler handler in _handlers.OfType<DelegatingHandler>())
             {
                 current.Should().BeSameAs(handler);
-                current = handler.InnerHandler;
+                current = handler.InnerHandler!;
             }
         }
 
@@ -114,7 +114,7 @@ public void Should_end_the_chain_with_the_last_HttpClientHandler()
             DelegatingHandler? @delegate;
             while ((@delegate = current as DelegatingHandler) != null)
             {
-                current = @delegate.InnerHandler;
+                current = @delegate.InnerHandler!;
             }
 
             current.Should().BeSameAs(_last);

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class ResponseDataWrapper<TResponse> : IResponseDataWrapper<TResponse>`
`17`	`17`	`/// Initializes a new instance of the <see cref="ResponseDataWrapper{TResponse}"/> class.`
`18`	`18`	`/// </summary>`
`19`	`19`	`/// <param name="response">The <see cref="Response"/> object.</param>`
`20`		`- public ResponseDataWrapper(TResponse response = default)`
	`20`	`+ public ResponseDataWrapper(TResponse response)`
`21`	`21`	`{`
`22`	`22`	`Response = response;`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ public async Task Should_set_the_bearer_token_with_the_specified_access_token()`
`73`	`73`	`await Sut.GetChargeStateAsync(_vehicleId, AccessToken).ConfigureAwait(false);`
`74`	`74`
`75`	`75`	`// Assert`
`76`		`- Handler.Request.Headers.Authorization.Scheme.Should().Be("Bearer");`
`77`		`- Handler.Request.Headers.Authorization.Parameter.Should().Be(AccessToken);`
	`76`	`+ Handler.Request.Headers.Authorization?.Scheme.Should().Be("Bearer");`
	`77`	`+ Handler.Request.Headers.Authorization?.Parameter.Should().Be(AccessToken);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ public async Task Should_set_the_bearer_token_with_the_specified_access_token()`
`71`	`71`	`await Sut.GetVehiclesAsync(AccessToken).ConfigureAwait(false);`
`72`	`72`
`73`	`73`	`// Assert`
`74`		`- Handler.Request.Headers.Authorization.Scheme.Should().Be("Bearer");`
`75`		`- Handler.Request.Headers.Authorization.Parameter.Should().Be(AccessToken);`
	`74`	`+ Handler.Request.Headers.Authorization?.Scheme.Should().Be("Bearer");`
	`75`	`+ Handler.Request.Headers.Authorization?.Parameter.Should().Be(AccessToken);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ protected override async Task<HttpResponseMessage> SendAsync(`
`177`	`177`	`return responseMessage;`
`178`	`178`	`}`
`179`	`179`
`180`		`- private static async Task<string?> GetStringContent(HttpContent content)`
	`180`	`+ private static async Task<string?> GetStringContent(HttpContent? content)`
`181`	`181`	`{`
`182`	`182`	`if (content is null)`
`183`	`183`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@ public async Task Should_set_the_bearer_token_with_the_specified_access_token()`
`60`	`60`	`await Sut.RevokeAccessTokenAsync(_accessToken).ConfigureAwait(false);`
`61`	`61`
`62`	`62`	`// Assert`
`63`		`- Handler.Request.Headers.Authorization.Scheme.Should().Be("Bearer");`
`64`		`- Handler.Request.Headers.Authorization.Parameter.Should().Be(_accessToken);`
	`63`	`+ Handler.Request.Headers.Authorization?.Scheme.Should().Be("Bearer");`
	`64`	`+ Handler.Request.Headers.Authorization?.Parameter.Should().Be(_accessToken);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`[Fact]`