Skip to content

Commit 4469c03

Browse files
committed
Add .NET9 moniker
Upgrade to xUnit 3.0 +semver: minor
1 parent 66d9d55 commit 4469c03

File tree

5 files changed

+21
-17
lines changed

5 files changed

+21
-17
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup .NET
2525
uses: actions/setup-dotnet@v3
2626
with:
27-
dotnet-version: 8.0.x
27+
dotnet-version: 9.0.x
2828

2929
- name: Restore dependencies
3030
run: dotnet restore

AsyncMemoryCache.Tests/AsyncMemoryCache.Tests.csproj

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66

77
<IsPackable>false</IsPackable>
@@ -15,34 +15,36 @@
1515

1616
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1717
<CodeAnalysisTreatWarningsAsErrors>true</CodeAnalysisTreatWarningsAsErrors>
18+
19+
<NoWarn>RCS1090</NoWarn>
1820
</PropertyGroup>
1921

2022
<ItemGroup>
21-
<PackageReference Include="coverlet.msbuild" Version="6.0.1">
23+
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
2224
<PrivateAssets>all</PrivateAssets>
2325
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2426
</PackageReference>
25-
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
27+
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
2628
<PrivateAssets>all</PrivateAssets>
2729
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2830
</PackageReference>
29-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
30-
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.2.0" />
31-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
32-
<PackageReference Include="NSubstitute" Version="5.1.0" />
31+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
32+
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.0.0" />
33+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
34+
<PackageReference Include="NSubstitute" Version="5.3.0" />
3335
<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
3436
<PrivateAssets>all</PrivateAssets>
3537
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3638
</PackageReference>
37-
<PackageReference Include="xunit" Version="2.7.0" />
38-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
39+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.49">
3940
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4041
<PrivateAssets>all</PrivateAssets>
4142
</PackageReference>
42-
<PackageReference Include="coverlet.collector" Version="6.0.1">
43+
<PackageReference Include="coverlet.collector" Version="6.0.2">
4344
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4445
<PrivateAssets>all</PrivateAssets>
4546
</PackageReference>
47+
<PackageReference Include="xunit.v3" Version="0.6.0-pre.7" />
4648
</ItemGroup>
4749

4850
<ItemGroup>

AsyncMemoryCache.Tests/AsyncMemoryCacheTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ public async Task FactoryIsInvoked_DoesNotBlock()
2323

2424
var factory = () =>
2525
{
26-
semaphore.Wait();
26+
semaphore.Wait(TestContext.Current.CancellationToken);
2727
return Task.FromResult(Substitute.For<IAsyncDisposable>());
2828
};
2929

3030
CacheEntityReference<string, IAsyncDisposable>? cacheEntityReference = null;
31-
var ex = await Record.ExceptionAsync(() => Task.Run(() => cacheEntityReference = target.GetOrCreate("test", factory)).WaitAsync(TimeSpan.FromMilliseconds(500)));
31+
var ex = await Record.ExceptionAsync(() => Task.Run(() => cacheEntityReference = target.GetOrCreate("test", factory)).WaitAsync(TimeSpan.FromMilliseconds(500), TestContext.Current.CancellationToken));
3232

3333
Assert.Null(ex);
3434
Assert.NotNull(cacheEntityReference);

AsyncMemoryCache.sln

+2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1475ABAD-E93D-49CD-B62E-7EDE68AFB42C}"
99
ProjectSection(SolutionItems) = preProject
1010
.editorconfig = .editorconfig
11+
.github\workflows\build.yml = .github\workflows\build.yml
1112
README.md = README.md
13+
GitVersion.yml = GitVersion.yml
1214
EndProjectSection
1315
EndProject
1416
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AsyncMemoryCache.Tests", "AsyncMemoryCache.Tests\AsyncMemoryCache.Tests.csproj", "{85CFDDDA-4AA0-42EE-913A-D7357695208F}"

AsyncMemoryCache/AsyncMemoryCache.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;netstandard2.0;net462</TargetFrameworks>
4+
<TargetFrameworks>net9.0;net8.0;netstandard2.0;net462</TargetFrameworks>
55
<Nullable>enable</Nullable>
66

77
<LangVersion>latest</LangVersion>
@@ -45,14 +45,14 @@
4545
</ItemGroup>
4646

4747
<ItemGroup>
48-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
48+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
4949
<PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.2" />
5050

51-
<PackageReference Include="Roslynator.Analyzers" Version="4.11.0">
51+
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
5252
<PrivateAssets>all</PrivateAssets>
5353
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5454
</PackageReference>
55-
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.11.0">
55+
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.12.9">
5656
<PrivateAssets>all</PrivateAssets>
5757
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5858
</PackageReference>

0 commit comments

Comments
 (0)