Merge pull request #228 from dvonthenen/linting-dotnet-analyzer

Linter Updates From .NET Analyzers
deepgram · Feb 12, 2024 · 16fae96 · 16fae96
2 parents 5e4b10c + d19ac8f
commit 16fae96
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 36 deletions.
diff --git a/Deepgram.Tests/GlobalUsings.cs b/Deepgram.Tests/GlobalUsings.cs
@@ -2,10 +2,6 @@
 // Use of this source code is governed by a MIT license that can be found in the LICENSE file.
 // SPDX-License-Identifier: MIT
 
-global using System.Net;
-global using System.Text;
-global using System.Text.Json;
-global using System.Web;
 global using AutoBogus;
 global using Bogus;
 global using Deepgram.Abstractions;
@@ -15,6 +11,9 @@
 global using Deepgram.Utilities;
 global using FluentAssertions;
 global using FluentAssertions.Execution;
-global using Microsoft.Extensions.DependencyInjection;
 global using NSubstitute;
 global using NUnit.Framework;
+global using System.Net;
+global using System.Text;
+global using System.Text.Json;
+global using System.Web;
diff --git a/Deepgram.Tests/UnitTests/ClientTests/AbstractRestClientTests.cs b/Deepgram.Tests/UnitTests/ClientTests/AbstractRestClientTests.cs
@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: MIT
 
 using Deepgram.Encapsulations;
+using Deepgram.Models.Authenticate.v1;
 using Deepgram.Models.Manage.v1;
 using Deepgram.Models.PreRecorded.v1;
-using Deepgram.Models.Authenticate.v1;
 
 namespace Deepgram.Tests.UnitTests.ClientTests;
 

diff --git a/Deepgram.Tests/UnitTests/ClientTests/LiveClientTests.cs b/Deepgram.Tests/UnitTests/ClientTests/LiveClientTests.cs
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a MIT license that can be found in the LICENSE file.
 // SPDX-License-Identifier: MIT
 
-using System.Net.WebSockets;
 using Deepgram.DeepgramEventArgs;
-using Deepgram.Models.Live.v1;
 using Deepgram.Models.Authenticate.v1;
+using Deepgram.Models.Live.v1;
+using System.Net.WebSockets;
 
 namespace Deepgram.Tests.UnitTests.ClientTests;
 

diff --git a/Deepgram.Tests/UnitTests/ClientTests/ManageClientTest.cs b/Deepgram.Tests/UnitTests/ClientTests/ManageClientTest.cs
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: MIT
 
 using Deepgram.Encapsulations;
-using Deepgram.Models.Manage.v1;
 using Deepgram.Models.Authenticate.v1;
+using Deepgram.Models.Manage.v1;
 
 namespace Deepgram.Tests.UnitTests.ClientTests;
 

diff --git a/Deepgram.Tests/UnitTests/ClientTests/OnPremClientTests.cs b/Deepgram.Tests/UnitTests/ClientTests/OnPremClientTests.cs
@@ -3,9 +3,9 @@
 // SPDX-License-Identifier: MIT
 
 using Deepgram.Encapsulations;
+using Deepgram.Models.Authenticate.v1;
 using Deepgram.Models.Manage.v1;
 using Deepgram.Models.OnPrem.v1;
-using Deepgram.Models.Authenticate.v1;
 
 namespace Deepgram.Tests.UnitTests.ClientTests;
 

diff --git a/Deepgram.Tests/UnitTests/ClientTests/PrerecordedClientTests.cs b/Deepgram.Tests/UnitTests/ClientTests/PrerecordedClientTests.cs
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: MIT
 
 using Deepgram.Encapsulations;
-using Deepgram.Models.PreRecorded.v1;
 using Deepgram.Models.Authenticate.v1;
+using Deepgram.Models.PreRecorded.v1;
 
 namespace Deepgram.Tests.UnitTests.ClientTests;
 

diff --git a/Deepgram.Tests/UnitTests/ExtensionsTests/HttpClientExtensionTests.cs b/Deepgram.Tests/UnitTests/ExtensionsTests/HttpClientExtensionTests.cs
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a MIT license that can be found in the LICENSE file.
 // SPDX-License-Identifier: MIT
 
-using Deepgram.Models.Manage.v1;
 using Deepgram.Models.Authenticate.v1;
+using Deepgram.Models.Manage.v1;
 
 namespace Deepgram.Tests.UnitTests.ExtensionsTests;
 public class HttpClientExtensionTests

diff --git a/Deepgram/Abstractions/AbstractRestClient.cs b/Deepgram/Abstractions/AbstractRestClient.cs
@@ -136,7 +136,7 @@ public virtual async Task<T> PatchAsync<T>(string uriSegment, StringContent cont
         {
 #if NETSTANDARD2_0
             var request = new HttpRequestMessage(new HttpMethod("PATCH"), uriSegment) { Content = content };
-            var response = await _httpClientWrapper.SendAsync(request,cancellationToken);
+            var response = await _httpClientWrapper.SendAsync(request, cancellationToken);
 #else
             var req = new HttpRequestMessage(HttpMethod.Patch, uriSegment) { Content = content };
             var response = await _httpClientWrapper.SendAsync(req, cancellationToken);

diff --git a/Deepgram/Constants/Defaults.cs b/Deepgram/Constants/Defaults.cs
@@ -6,12 +6,8 @@ namespace Deepgram.Constants;
 
 public static class Defaults
 {
-
     public const string DEFAULT_URI = "api.deepgram.com";
     public const string HTTPCLIENT_NAME = "DEEPGRAM_HTTP_CLIENT";
     public const string WSSCLIENT_NAME = "DEEPGRAM_WSS_CLIENT";
     public const string DEFAULT_CONTENT_TYPE = "application/json";
-    public const string DEEPGRAM_CONTENT_TYPE = "deepgram/audio+video";
-
-
 }
diff --git a/Deepgram/Deepgram.csproj b/Deepgram/Deepgram.csproj
@@ -24,6 +24,9 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <RepositoryUrl>https://github.com/deepgram-devs/deepgram-dotnet-sdk</RepositoryUrl>
     <PackageTags>speech-to-text,captions,speech-recognition,deepgram,dotnet</PackageTags>
+    <EnableNETAnalyzers>True</EnableNETAnalyzers>
+    <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
+    <AnalysisLevel>latest</AnalysisLevel>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">     
@@ -37,13 +40,13 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.*" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.*" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.*" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.*" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.1" />
     <PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
-    <PackageReference Include="System.Text.Json" Version="6.*" />
-    <PackageReference Include="System.Threading.Channels" Version="6.*" />
+    <PackageReference Include="System.Text.Json" Version="8.0.1" />
+    <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
@@ -83,4 +86,12 @@
     <InternalsVisibleTo Include="Deepgram.Tests" />    
   </ItemGroup>
 
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/Deepgram/Encapsulations/HttpClientFactory.cs b/Deepgram/Encapsulations/HttpClientFactory.cs
@@ -6,6 +6,7 @@
 using Deepgram.Models.Authenticate.v1;
 
 namespace Deepgram.Encapsulations;
+
 internal class HttpClientFactory
 {
     public static HttpClientWrapper Create(string apiKey, DeepgramClientOptions deepgramClientOptions)

diff --git a/Deepgram/Enums/LiveType.cs b/Deepgram/Enums/LiveType.cs
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: MIT
 
 namespace Deepgram.Enums;
+
 public enum LiveType
 {
     Metadata,

diff --git a/Deepgram/LiveClient.cs b/Deepgram/LiveClient.cs
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: MIT
 
 using Deepgram.Extensions;
-using Deepgram.Models.Live.v1;
 using Deepgram.Models.Authenticate.v1;
+using Deepgram.Models.Live.v1;
 
 namespace Deepgram;
 

diff --git a/Deepgram/Logger/LogProvider.cs b/Deepgram/Logger/LogProvider.cs
@@ -28,8 +28,4 @@ public static ILogger GetLogger(string category)
         // Return the logger
         return logger;
     }
-
-
-
-
 }
diff --git a/Deepgram/ManageClient.cs b/Deepgram/ManageClient.cs
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a MIT license that can be found in the LICENSE file.
 // SPDX-License-Identifier: MIT
 
-using Deepgram.Models.Manage.v1;
 using Deepgram.Models.Authenticate.v1;
+using Deepgram.Models.Manage.v1;
 
 namespace Deepgram;
 

diff --git a/Deepgram/OnPremClient.cs b/Deepgram/OnPremClient.cs
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a MIT license that can be found in the LICENSE file.
 // SPDX-License-Identifier: MIT
 
+using Deepgram.Models.Authenticate.v1;
 using Deepgram.Models.Manage.v1;
 using Deepgram.Models.OnPrem.v1;
-using Deepgram.Models.Authenticate.v1;
 
 namespace Deepgram;
 

diff --git a/Deepgram/PrerecordedClient.cs b/Deepgram/PrerecordedClient.cs
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a MIT license that can be found in the LICENSE file.
 // SPDX-License-Identifier: MIT
 
-using Deepgram.Models.PreRecorded.v1;
 using Deepgram.Models.Authenticate.v1;
+using Deepgram.Models.PreRecorded.v1;
 
 namespace Deepgram;
 

diff --git a/Deepgram/Utilities/RequestContentUtil.cs b/Deepgram/Utilities/RequestContentUtil.cs
@@ -21,10 +21,7 @@ internal static class RequestContentUtil
     internal static StringContent CreatePayload<T>(T body)
     {
         var serialized = JsonSerializer.Serialize(body, _jsonSerializerOptions);
-        return new(
-                                serialized,
-                               Encoding.UTF8,
-                               Defaults.DEFAULT_CONTENT_TYPE);
+        return new(serialized, Encoding.UTF8, Defaults.DEFAULT_CONTENT_TYPE);
     }
 
 
@@ -37,7 +34,6 @@ internal static HttpContent CreateStreamPayload(Stream body)
     {
         body.Seek(0, SeekOrigin.Begin);
         HttpContent httpContent = new StreamContent(body);
-        httpContent.Headers.Add("Content-Type", Defaults.DEEPGRAM_CONTENT_TYPE);
         httpContent.Headers.Add("Content-Length", body.Length.ToString());
         return httpContent;
     }