Skip to content

Commit c8484f6

Browse files
committed
Upgrades CodeAnalysis package to v3.2.2
- Bumps `Neolution.CodeAnalysis` from 2.6.1 to 3.2.2 across all projects - Replaces blocking `Thread.Sleep` calls with async `Task.Delay` to comply with new analyzer rules - Removes unused `using` directives flagged by updated ruleset - Converts sync test method to `async Task` to support the async delay
1 parent 3b17dbf commit c8484f6

10 files changed

Lines changed: 12 additions & 17 deletions

File tree

Neolution.Extensions.Caching.Abstractions/Neolution.Extensions.Caching.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
11-
<PackageReference Include="Neolution.CodeAnalysis" Version="2.6.1">
11+
<PackageReference Include="Neolution.CodeAnalysis" Version="3.2.2">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>

Neolution.Extensions.Caching.Distributed/Neolution.Extensions.Caching.Distributed.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="Foundatio.MessagePack" Version="12.0.0" />
1111
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
1212
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
13-
<PackageReference Include="Neolution.CodeAnalysis" Version="2.6.1">
13+
<PackageReference Include="Neolution.CodeAnalysis" Version="3.2.2">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>

Neolution.Extensions.Caching.InMemory/Neolution.Extensions.Caching.InMemory.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.2" />
11-
<PackageReference Include="Neolution.CodeAnalysis" Version="2.6.1">
11+
<PackageReference Include="Neolution.CodeAnalysis" Version="3.2.2">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>

Neolution.Extensions.Caching.RedisHybrid/Neolution.Extensions.Caching.RedisHybrid.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="Foundatio.MessagePack" Version="12.0.0" />
1111
<PackageReference Include="Foundatio.Redis" Version="12.0.0" />
1212
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
13-
<PackageReference Include="Neolution.CodeAnalysis" Version="2.6.1">
13+
<PackageReference Include="Neolution.CodeAnalysis" Version="3.2.2">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>

Neolution.Extensions.Caching.UnitTests/CacheKeyVersioningTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
using System;
44
using Microsoft.Extensions.DependencyInjection;
55
using Neolution.Extensions.Caching.Abstractions;
6-
using Neolution.Extensions.Caching.Distributed;
7-
using Neolution.Extensions.Caching.RedisHybrid;
86
using Neolution.Extensions.Caching.UnitTests.Models;
97
using Shouldly;
108
using Xunit;

Neolution.Extensions.Caching.UnitTests/DistributedCacheAsyncTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
namespace Neolution.Extensions.Caching.UnitTests
22
{
33
using System;
4-
using System.Threading;
54
using System.Threading.Tasks;
65
using Microsoft.Extensions.DependencyInjection;
76
using Neolution.Extensions.Caching.Abstractions;
@@ -108,13 +107,13 @@ public async Task RefreshedObjectDidNotExpire(IServiceCollection serviceCollecti
108107
await cache.SetWithOptionsAsync(TestCacheId.NonRefreshedFoobar, cacheObject, options);
109108

110109
// After a wait of 500ms, refresh only one of the objects.
111-
Thread.Sleep(TimeSpan.FromMilliseconds(500));
110+
await Task.Delay(TimeSpan.FromMilliseconds(500));
112111

113112
//await cache.RefreshAsync(TestCacheId.Foobar)
114113

115114
// After a wait of 750ms, one of the objects should now be expired because its at least 1250ms (500+750) old at the moment.
116115
// But the refreshed object should still be valid for roughly another 250ms.
117-
Thread.Sleep(TimeSpan.FromMilliseconds(750));
116+
await Task.Delay(TimeSpan.FromMilliseconds(750));
118117

119118
// Assert
120119
(await cache.GetAsync<string>(TestCacheId.Foobar)).ShouldBe(cacheObject);

Neolution.Extensions.Caching.UnitTests/DistributedCacheTests.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace Neolution.Extensions.Caching.UnitTests
22
{
33
using System;
4-
using System.Threading;
4+
using System.Threading.Tasks;
55
using Microsoft.Extensions.DependencyInjection;
66
using Neolution.Extensions.Caching.Abstractions;
77
using Neolution.Extensions.Caching.UnitTests.Models;
@@ -81,9 +81,10 @@ public void RemovedObjectCannotBeRetrievedAgain(IServiceCollection serviceCollec
8181
/// Tests if removed object cannot be retrieved again from the cache.
8282
/// </summary>
8383
/// <param name="serviceCollection">The service collection.</param>
84+
/// <returns>A <see cref="Task"/> representing the asynchronous unit test.</returns>
8485
[Theory(Skip = "Refresh() is removed from interface (no strong use-case)")]
8586
[ClassData(typeof(ServiceCollectionTestDataCollection))]
86-
public void RefreshedObjectDidNotExpire(IServiceCollection serviceCollection)
87+
public async Task RefreshedObjectDidNotExpire(IServiceCollection serviceCollection)
8788
{
8889
// Assign
8990
using var serviceProvider = serviceCollection.BuildServiceProvider();
@@ -101,13 +102,13 @@ public void RefreshedObjectDidNotExpire(IServiceCollection serviceCollection)
101102
cache.SetWithOptions(TestCacheId.NonRefreshedFoobar, cacheObject, options);
102103

103104
// After a wait of 500ms, refresh only one of the objects.
104-
Thread.Sleep(TimeSpan.FromMilliseconds(500));
105+
await Task.Delay(TimeSpan.FromMilliseconds(500));
105106

106107
//cache.Refresh(TestCacheId.Foobar)
107108

108109
// After a wait of 750ms, one of the objects should now be expired because its at least 1250ms (500+750) old at the moment.
109110
// But the refreshed object should still be valid for roughly another 250ms.
110-
Thread.Sleep(TimeSpan.FromMilliseconds(750));
111+
await Task.Delay(TimeSpan.FromMilliseconds(750));
111112

112113
// Assert
113114
cache.Get<string>(TestCacheId.Foobar).ShouldBe(cacheObject);

Neolution.Extensions.Caching.UnitTests/MsgPackSerializerTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
{
33
using System;
44
using System.IO;
5-
using MessagePack;
65
using Neolution.Extensions.Caching.RedisHybrid;
76
using Neolution.Extensions.Caching.UnitTests.Models;
87
using Shouldly;

Neolution.Extensions.Caching.UnitTests/Neolution.Extensions.Caching.UnitTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Foundatio.Xunit" Version="12.0.0" />
1515
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.2" />
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
17-
<PackageReference Include="Neolution.CodeAnalysis.TestsRuleset" Version="2.6.1">
17+
<PackageReference Include="Neolution.CodeAnalysis.TestsRuleset" Version="3.2.2">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>

Neolution.Extensions.Caching.UnitTests/RedisHybridCacheTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
{
33
using System;
44
using System.Threading.Tasks;
5-
using Foundatio.Caching;
65
using Foundatio.Xunit;
76
using Microsoft.Extensions.DependencyInjection;
87
using Microsoft.Extensions.Logging;
98
using Neolution.Extensions.Caching.Abstractions;
109
using Neolution.Extensions.Caching.RedisHybrid;
1110
using Neolution.Extensions.Caching.UnitTests.Models;
1211
using Shouldly;
13-
using StackExchange.Redis;
1412
using Xunit;
1513
using Xunit.Abstractions;
1614

0 commit comments

Comments
 (0)