Skip to content

Commit a9fb131

Browse files
committed
Upgrade to .NET 10
1 parent 5c4c1e6 commit a9fb131

File tree

135 files changed

+3793
-4138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+3793
-4138
lines changed

.editorconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ charset = utf-8-bom
44

55
[*.cs]
66

7+
dotnet_diagnostic.IDISP005.severity = suggestion
8+
dotnet_diagnostic.S1481.severity = suggestion
79
dotnet_diagnostic.MA0025.severity = suggestion
810
dotnet_diagnostic.S3878.severity = suggestion
911
dotnet_diagnostic.S127.severity = suggestion
@@ -44,7 +46,7 @@ dotnet_diagnostic.IDISP001.severity = error
4446
dotnet_diagnostic.IDISP002.severity = error
4547
dotnet_diagnostic.IDISP003.severity = error
4648
dotnet_diagnostic.IDISP004.severity = error
47-
dotnet_diagnostic.IDISP005.severity = error
49+
dotnet_diagnostic.IDISP005.severity = suggestion
4850
dotnet_diagnostic.IDISP006.severity = error
4951
dotnet_diagnostic.IDISP007.severity = error
5052
dotnet_diagnostic.IDISP008.severity = error

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Setup .NET Core
1313
uses: actions/setup-dotnet@v5
1414
with:
15-
dotnet-version: 9.0.x
15+
dotnet-version: 10.0.x
1616
- name: Build EFCoreSecondLevelCacheInterceptor lib
1717
run: dotnet build ./src/EFCoreSecondLevelCacheInterceptor/EFCoreSecondLevelCacheInterceptor.csproj --configuration Release
1818

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
# Initializes the CodeQL tools for scanning.
4949
- name: Initialize CodeQL
50-
uses: github/codeql-action/init@v3
50+
uses: github/codeql-action/init@v4
5151
with:
5252
languages: ${{ matrix.language }}
5353
config-file: ./.github/workflows/codeql/codeql-config.yml
@@ -62,11 +62,11 @@ jobs:
6262
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
6363
# If this step fails, then you should remove it and run the build manually (see below)
6464
# - name: Autobuild
65-
# uses: github/codeql-action/autobuild@v3
65+
# uses: github/codeql-action/autobuild@v4
6666
- name: Setup .NET
6767
uses: actions/setup-dotnet@v5
6868
with:
69-
dotnet-version: 9.0.x
69+
dotnet-version: 10.0.x
7070
- name: Build
7171
run: dotnet build --configuration Release
7272

@@ -81,6 +81,6 @@ jobs:
8181
# ./location_of_script_within_repo/buildscript.sh
8282

8383
- name: Perform CodeQL Analysis
84-
uses: github/codeql-action/analyze@v3
84+
uses: github/codeql-action/analyze@v4
8585
with:
8686
category: "/language:${{matrix.language}}"

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>5.3.3</VersionPrefix>
3+
<VersionPrefix>5.3.4</VersionPrefix>
44
<LangVersion>latest</LangVersion>
55
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
66
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>

Directory.Packages.props

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,34 @@
44
<PackageVersion Include="CacheManager.StackExchange.Redis" Version="2.0.0" />
55
<PackageVersion Include="CacheManager.Microsoft.Extensions.Caching.Memory" Version="2.0.0" />
66
<PackageVersion Include="CacheManager.Serialization.Json" Version="2.0.0" />
7-
<PackageVersion Include="BenchmarkDotNet" Version="0.15.4" />
7+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.6" />
88
<PackageVersion Include="EasyCaching.Core" Version="[1.9.2,)" />
99
<PackageVersion Include="EasyCaching.InMemory" Version="1.9.2" />
1010
<PackageVersion Include="EasyCaching.Redis" Version="1.9.2" />
1111
<PackageVersion Include="EasyCaching.HybridCache" Version="1.9.2" />
1212
<PackageVersion Include="EasyCaching.Bus.Redis" Version="1.9.2" />
1313
<PackageVersion Include="EasyCaching.Serialization.MessagePack" Version="1.9.2" />
1414
<PackageVersion Include="EasyCaching.Serialization.SystemTextJson" Version="1.9.2" />
15-
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.6" />
15+
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.0" />
1616
<PackageVersion Include="ZiggyCreatures.FusionCache" Version="2.4.0" />
17-
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.9.0" />
17+
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="10.0.0" />
1818
<PackageVersion Include="MessagePack" Version="3.1.4" />
1919
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
20-
<PackageVersion Include="StackExchange.Redis" Version="2.9.25" />
20+
<PackageVersion Include="StackExchange.Redis" Version="2.9.32" />
2121
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
22-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
23-
<PackageVersion Include="MSTest.TestFramework" Version="4.0.0" />
24-
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.0" />
22+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
23+
<PackageVersion Include="MSTest.TestFramework" Version="4.0.2" />
24+
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.2" />
2525
<PackageVersion Include="Moq" Version="4.20.72" />
2626
<PackageVersion Include="xunit" Version="2.9.3" />
2727
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
2828
<PackageVersion Include="ZiggyCreatures.FusionCache.Serialization.NewtonsoftJson" Version="2.4.0" />
2929
<PackageVersion Include="IDisposableAnalyzers" Version="4.0.8" />
3030
</ItemGroup>
3131
<ItemGroup>
32-
<PackageVersion Include="Meziantou.Analyzer" Version="2.0.224" />
32+
<PackageVersion Include="Meziantou.Analyzer" Version="2.0.253" />
3333
<PackageVersion Include="SonarAnalyzer.CSharp" Version="10.15.0.120848" />
34-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Analyzers" Version="9.0.0" />
34+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Analyzers" Version="10.0.0" />
3535
</ItemGroup>
3636
<ItemGroup>
3737
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
@@ -76,31 +76,37 @@
7676
<PackageVersion Include="System.IO.Hashing" Version="[9.0.0,)" />
7777
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="[9.0.0,)" />
7878
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="[9.0.0,)" />
79-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Abstractions" Version="9.0.0" />
80-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0" />
81-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
82-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
79+
</ItemGroup>
80+
81+
<ItemGroup Condition="('$(TargetFramework)' == 'net10.0')">
82+
<PackageVersion Include="System.IO.Hashing" Version="[10.0.0,)" />
83+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="[10.0.0,)" />
84+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="[10.0.0,)" />
85+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Abstractions" Version="10.0.0" />
86+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0" />
87+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0" />
88+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
8389
<PackageVersion Include="Lamar.Microsoft.DependencyInjection" Version="15.0.1" />
84-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
85-
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
86-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
87-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
88-
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
89-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0" />
90-
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
91-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
92-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
93-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
94-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
95-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
96-
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.0" />
97-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
98-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.0" />
90+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
91+
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0" />
92+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
93+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
94+
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
95+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0" />
96+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0" />
97+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
98+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
99+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
100+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
101+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
102+
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.0" />
103+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0" />
104+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="10.0.0" />
99105
<PackageVersion Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
100106
<PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
101-
<PackageVersion Include="MySql.EntityFrameworkCore" Version="9.0.0" />
102-
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0" />
103-
<PackageVersion Include="EFCore.BulkExtensions" Version="9.0.1" />
104-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="9.0.0" />
107+
<PackageVersion Include="MySql.EntityFrameworkCore" Version="10.0.0-rc" />
108+
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0-rc.2" />
109+
<PackageVersion Include="EFCore.BulkExtensions" Version="9.0.2" />
110+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="10.0.0" />
105111
</ItemGroup>
106112
</Project>

0 commit comments

Comments
 (0)