Merge pull request #55 from atc-net/feature/deps

Update dependencies
atc-net · Apr 25, 2024 · b4e5206 · b4e5206
2 parents 353b405 + 3029d44
commit b4e5206
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 36 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -32,7 +32,7 @@
 
   <PropertyGroup Label="Compile settings">
     <Nullable>enable</Nullable>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>1573,1591,1712</NoWarn>
 
@@ -55,12 +55,9 @@
 
   <!-- Shared code analyzers used for all projects in the solution -->
   <ItemGroup Label="Code Analyzers">
-    <PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
-    <PackageReference Include="Asyncify" Version="0.9.7" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" PrivateAssets="All" />
-    <PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.5" PrivateAssets="all" />
+    <PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="8.43.0.51858" PrivateAssets="all" />
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.24.0.89429" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Atc.Cosmos/Atc.Cosmos.csproj b/src/Atc.Cosmos/Atc.Cosmos.csproj
@@ -8,13 +8,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="System.Text.Json" Version="6.0.5" />
     <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.35.1-preview" Condition="$(IsPreview)" />
-    <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.35.1" Condition="!$(IsPreview)" />
+    <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.39.1" Condition="!$(IsPreview)" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">

diff --git a/src/Atc.Cosmos/Internal/CosmosClientProvider.cs b/src/Atc.Cosmos/Internal/CosmosClientProvider.cs
@@ -25,10 +25,10 @@ public CosmosClientProvider(
         }
 
         public CosmosClient GetClient(CosmosOptions options)
-            => cosmosClientCache.AddOrUpdate(options, _ => CreateClient(options, allowBulk: false), (o, c) => c);
+            => cosmosClientCache.AddOrUpdate(options, o => CreateClient(o, allowBulk: false), (o, c) => c);
 
         public CosmosClient GetBulkClient(CosmosOptions options)
-            => cosmosBulkClientCache.AddOrUpdate(options, _ => CreateClient(options, allowBulk: true), (o, c) => c);
+            => cosmosBulkClientCache.AddOrUpdate(options, o => CreateClient(o, allowBulk: true), (o, c) => c);
 
         public void Dispose()
         {

diff --git a/src/Atc.Cosmos/Internal/CosmosContainerRegistry.cs b/src/Atc.Cosmos/Internal/CosmosContainerRegistry.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Azure.Cosmos;
 using Microsoft.Extensions.Options;
 
 namespace Atc.Cosmos.Internal
@@ -41,7 +40,7 @@ public ICosmosContainerNameProvider GetContainerForType<TType>()
             => GetContainerForType(typeof(TType));
 
         public ICosmosContainerNameProvider GetContainerForType(Type resourceType)
-            => providers.FirstOrDefault(p => p.IsForType(resourceType))
+            => providers.Find(p => p.IsForType(resourceType))
             ?? throw new NotSupportedException(
                 $"Type {resourceType.Name} is not supported.");
 

diff --git a/src/Atc.Cosmos/Internal/CosmosInitializer.cs b/src/Atc.Cosmos/Internal/CosmosInitializer.cs
@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
 using System.Net.Sockets;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Azure.Cosmos;
-using Microsoft.Extensions.Options;
 
 namespace Atc.Cosmos.Internal
 {
@@ -16,7 +14,6 @@ namespace Atc.Cosmos.Internal
     public class CosmosInitializer : ICosmosInitializer
     {
         private readonly ICosmosClientProvider provider;
-        private readonly ICosmosContainerRegistry registry;
         private readonly IReadOnlyDictionary<CosmosOptions, List<ICosmosContainerInitializer>> initializers;
 
         public CosmosInitializer(
@@ -25,7 +22,6 @@ public CosmosInitializer(
             ICosmosContainerRegistry registry)
         {
             this.provider = provider;
-            this.registry = registry;
             this.initializers = initializers
                 .GroupBy(i => i.Scope ?? registry.DefaultOptions)
                 .ToDictionary(i => i.Key, i => i.Select(n => n.Initializer).ToList());

diff --git a/src/Atc.Cosmos/Testing/FakeCosmosReader.cs b/src/Atc.Cosmos/Testing/FakeCosmosReader.cs
@@ -302,7 +302,7 @@ public virtual async IAsyncEnumerable<IEnumerable<TResult>> BatchQueryAsync<TRes
                 }
             }
 
-            if (buffer.Any())
+            if (buffer.Count > 0)
             {
                 yield return buffer.ToImmutableList();
             }
@@ -338,7 +338,7 @@ public virtual async IAsyncEnumerable<IEnumerable<TResult>> BatchCrossPartitionQ
                 }
             }
 
-            if (buffer.Any())
+            if (buffer.Count > 0)
             {
                 yield return buffer.ToImmutableList();
             }

diff --git a/test/.editorconfig b/test/.editorconfig
@@ -55,4 +55,5 @@ dotnet_diagnostic.CA1812.severity = none            # Test classes used as gener
 dotnet_diagnostic.SA1202.severity = none            # Private helper methods makes sense to keep at top of test classes, as tests are added to bottom.
 dotnet_diagnostic.CA2201.severity = none            # Instantiating Exceptions as test data should be allowed.
 dotnet_diagnostic.MA0016.severity = none            # Prefer return collection abstraction instead of implementation
-dotnet_diagnostic.CA1002.severity = none            # Do not expose generic lists
+dotnet_diagnostic.CA1002.severity = none            # Do not expose generic lists
+dotnet_diagnostic.S6608.severity = none             # S6608: Prefer indexing instead of "Enumerable" methods on types implementing "IList"
diff --git a/test/Atc.Cosmos.Tests/Atc.Cosmos.Tests.csproj b/test/Atc.Cosmos.Tests/Atc.Cosmos.Tests.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="AsyncEnumerator" Version="4.0.2" />
-    <PackageReference Include="Atc.Test" Version="1.0.66" />
+    <PackageReference Include="Atc.Test" Version="1.0.79" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

diff --git a/test/Atc.Cosmos.Tests/CosmosBulkReaderBatchTests.cs b/test/Atc.Cosmos.Tests/CosmosBulkReaderBatchTests.cs
@@ -8,16 +8,13 @@
 using Dasync.Collections;
 using FluentAssertions;
 using Microsoft.Azure.Cosmos;
-using Microsoft.Extensions.Options;
 using NSubstitute;
-using NSubstitute.ExceptionExtensions;
 using Xunit;
 
 namespace Atc.Cosmos.Tests
 {
     public class CosmosBulkReaderBatchTests
     {
-        private readonly CosmosOptions options;
         private readonly ItemResponse<Record> itemResponse;
         private readonly FeedIterator<Record> feedIterator;
         private readonly FeedResponse<Record> feedResponse;
@@ -29,7 +26,6 @@ public class CosmosBulkReaderBatchTests
         public CosmosBulkReaderBatchTests()
         {
             var fixture = FixtureFactory.Create();
-            options = fixture.Create<CosmosOptions>();
             record = fixture.Create<Record>();
             itemResponse = Substitute.For<ItemResponse<Record>>();
             itemResponse

diff --git a/test/Atc.Cosmos.Tests/CosmosReaderBatchTests.cs b/test/Atc.Cosmos.Tests/CosmosReaderBatchTests.cs
@@ -8,16 +8,13 @@
 using Dasync.Collections;
 using FluentAssertions;
 using Microsoft.Azure.Cosmos;
-using Microsoft.Extensions.Options;
 using NSubstitute;
-using NSubstitute.ExceptionExtensions;
 using Xunit;
 
 namespace Atc.Cosmos.Tests
 {
     public class CosmosReaderBatchTests
     {
-        private readonly CosmosOptions options;
         private readonly ItemResponse<Record> itemResponse;
         private readonly FeedIterator<Record> feedIterator;
         private readonly FeedResponse<Record> feedResponse;
@@ -29,7 +26,6 @@ public class CosmosReaderBatchTests
         public CosmosReaderBatchTests()
         {
             var fixture = FixtureFactory.Create();
-            options = fixture.Create<CosmosOptions>();
             record = fixture.Create<Record>();
             itemResponse = Substitute.For<ItemResponse<Record>>();
             itemResponse

diff --git a/test/Atc.Cosmos.Tests/DependencyInjection/CosmosBuilderTests.cs b/test/Atc.Cosmos.Tests/DependencyInjection/CosmosBuilderTests.cs
@@ -1,13 +1,11 @@
 using System;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Atc.Cosmos.DependencyInjection;
 using Atc.Cosmos.Internal;
 using Atc.Test;
 using AutoFixture.AutoNSubstitute;
 using AutoFixture.Xunit2;
-using FluentAssertions;
 using Microsoft.Azure.Cosmos;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -18,7 +16,7 @@ namespace Atc.Cosmos.Tests.DependencyInjection
 {
     public class CosmosBuilderTests
     {
-        private class RecordInitializer : ICosmosContainerInitializer
+        private sealed class RecordInitializer : ICosmosContainerInitializer
         {
             public Task InitializeAsync(
                 Database database,

diff --git a/test/Atc.Cosmos.Tests/Generators/FakeTokenCredential.cs b/test/Atc.Cosmos.Tests/Generators/FakeTokenCredential.cs
@@ -5,7 +5,7 @@
 
 namespace Atc.Cosmos.Tests.Generators
 {
-    internal class FakeTokenCredential : TokenCredential
+    internal sealed class FakeTokenCredential : TokenCredential
     {
         private readonly AccessToken accessToken = new (
             "token",

diff --git a/test/Atc.Cosmos.Tests/LowPriorityCosmosReaderBatchTests.cs b/test/Atc.Cosmos.Tests/LowPriorityCosmosReaderBatchTests.cs
@@ -16,7 +16,6 @@ namespace Atc.Cosmos.Tests
 {
     public class LowPriorityCosmosReaderBatchTests
     {
-        private readonly CosmosOptions options;
         private readonly ItemResponse<Record> itemResponse;
         private readonly FeedIterator<Record> feedIterator;
         private readonly FeedResponse<Record> feedResponse;
@@ -28,7 +27,6 @@ public class LowPriorityCosmosReaderBatchTests
         public LowPriorityCosmosReaderBatchTests()
         {
             var fixture = FixtureFactory.Create();
-            options = fixture.Create<CosmosOptions>();
             record = fixture.Create<Record>();
             itemResponse = Substitute.For<ItemResponse<Record>>();
             itemResponse

diff --git a/test/Atc.Cosmos.Tests/Testing/FakeCosmosReaderTests.cs b/test/Atc.Cosmos.Tests/Testing/FakeCosmosReaderTests.cs
@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using Atc.Cosmos.Testing;
 using Atc.Test;
-using AutoFixture;
 using AutoFixture.Xunit2;
 using Dasync.Collections;
 using FluentAssertions;
@@ -327,7 +326,7 @@ public async Task PagedCrossPartitionQuery_Should_Return_All_Documents_When_Give
             var requiredDocuments = new HashSet<Record>(sut.Documents);
             string? continuationToken = null;
 
-            while (requiredDocuments.Any())
+            while (requiredDocuments.Count > 0)
             {
                 var result = await sut.CrossPartitionPagedQueryAsync(x => x.Where(_ => true), 1, continuationToken);
                 continuationToken = result.ContinuationToken;