Skip to content

Commit 53f6bcb

Browse files
Merge branch 'main' into SystemThreadingLock
2 parents ee89e00 + 1decac3 commit 53f6bcb

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

BitFaster.Caching.Benchmarks/TimeBenchmarks.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ namespace BitFaster.Caching.Benchmarks
1111
[SimpleJob(RuntimeMoniker.Net48)]
1212
#endif
1313
[SimpleJob(RuntimeMoniker.Net60)]
14+
[SimpleJob(RuntimeMoniker.Net90)]
1415
[HideColumns("Job", "Median", "RatioSD", "Alloc Ratio")]
1516
public class TimeBenchmarks
1617
{
@@ -71,6 +72,16 @@ public Duration DurationSinceEpoch()
7172
{
7273
return Duration.SinceEpoch();
7374
}
75+
76+
[Benchmark()]
77+
public long SystemTimeProvider()
78+
{
79+
#if NET8_0_OR_GREATER
80+
return TimeProvider.System.GetTimestamp();
81+
#else
82+
return 0;
83+
#endif
84+
}
7485
}
7586

7687
public static class TickCount64

BitFaster.Caching.UnitTests.Std/BitFaster.Caching.UnitTests.Std.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
</PackageReference>
1313
<PackageReference Include="FluentAssertions" Version="7.0.0" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
15-
<PackageReference Include="Moq" Version="4.20.70" />
15+
<PackageReference Include="Moq" Version="4.20.72" />
1616
<PackageReference Include="ObjectLayoutInspector" Version="0.1.4" />
1717
<PackageReference Include="xunit" Version="2.9.3" />
1818
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1919
<PrivateAssets>all</PrivateAssets>
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
</PackageReference>
22-
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
22+
<PackageReference Include="Xunit.SkippableFact" Version="1.5.23" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

BitFaster.Caching.UnitTests/BitFaster.Caching.UnitTests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>net48;netcoreapp3.1;net6.0;net9.0</TargetFrameworks>
@@ -12,14 +12,14 @@
1212
</PackageReference>
1313
<PackageReference Include="FluentAssertions" Version="7.0.0" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
15-
<PackageReference Include="Moq" Version="4.20.69" />
15+
<PackageReference Include="Moq" Version="4.20.72" />
1616
<PackageReference Include="ObjectLayoutInspector" Version="0.1.4" />
1717
<PackageReference Include="xunit" Version="2.9.3" />
1818
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1919
<PrivateAssets>all</PrivateAssets>
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
</PackageReference>
22-
<PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
22+
<PackageReference Include="Xunit.SkippableFact" Version="1.5.23" />
2323
</ItemGroup>
2424

2525
<ItemGroup Condition="'$(TargetFramework)' == 'net48'">

0 commit comments

Comments
 (0)