Keyed Services Support in dotnet 8

luoyunchong · Feb 22, 2024 · e769522 · e769522
1 parent 54f5b9f
commit e769522
Show file tree

Hide file tree

Showing 17 changed files with 65 additions and 57 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,8 +2,8 @@
  <PropertyGroup>
  <DefaultNetCoreTargetFramework>net6.0</DefaultNetCoreTargetFramework>
  <DefaultNetCoreTargetFrameworkVersion>net8.0</DefaultNetCoreTargetFrameworkVersion>
- <DefaultFreeSqlVersion>3.2.802</DefaultFreeSqlVersion>
+ <DefaultFreeSqlVersion>3.2.812</DefaultFreeSqlVersion>
  <DefaultAspNetCoreVersion>6.0.16</DefaultAspNetCoreVersion>
- <DefaultAspNetCoreVersion7>8.0.0</DefaultAspNetCoreVersion7>
+ <DefaultAspNetCoreVersion7>8.0.2</DefaultAspNetCoreVersion7>
  </PropertyGroup>
 </Project>
diff --git a/samples/IGeekFan.FreeKit.Web/IGeekFan.FreeKit.Web.csproj b/samples/IGeekFan.FreeKit.Web/IGeekFan.FreeKit.Web.csproj
@@ -6,15 +6,16 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.805" />
- <PackageReference Include="FreeSql.Provider.MySqlConnector" Version="3.2.805" />
- <PackageReference Include="FreeSql.Provider.MySql" Version="3.2.805" />
- <PackageReference Include="FreeSql.Provider.SqlServer" Version="3.2.805" />
- <PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.2.805" />
- <PackageReference Include="FreeSql.Provider.Oracle" Version="3.2.805" />
- <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
+ <PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.812" />
+ <PackageReference Include="FreeSql.Provider.MySqlConnector" Version="3.2.812" />
+ <PackageReference Include="FreeSql.Provider.MySql" Version="3.2.812" />
+ <PackageReference Include="FreeSql.Provider.SqlServer" Version="3.2.812" />
+ <PackageReference Include="FreeSql.Provider.PostgreSQL" Version="3.2.812" />
+ <PackageReference Include="FreeSql.Provider.Oracle" Version="3.2.812" />
+ <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2" />
  <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
- <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.2" />
+ <PackageReference Include="Xunit.DependencyInjection" Version="8.9.1" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/samples/Module1/Module1.csproj b/samples/Module1/Module1.csproj
@@ -14,6 +14,4 @@
  <ProjectReference Include="..\..\src\IGeekFan.FreeKit.Extras\IGeekFan.FreeKit.Extras.csproj" />
  <ProjectReference Include="..\..\src\IGeekFan.FreeKit.Modularity\IGeekFan.FreeKit.Modularity.csproj" />
  </ItemGroup>
-
-
 </Project>
diff --git a/samples/Module2/Module2.csproj b/samples/Module2/Module2.csproj
@@ -15,4 +15,8 @@
  <ProjectReference Include="..\..\src\IGeekFan.FreeKit.Modularity\IGeekFan.FreeKit.Modularity.csproj" />
  </ItemGroup>
 
+ <ItemGroup>
+ <PackageReference Include="Xunit.DependencyInjection" Version="8.9.1" />
+ </ItemGroup>
+
 </Project>
diff --git a/samples/Sample.Localization/Sample.Localization.csproj b/samples/Sample.Localization/Sample.Localization.csproj
@@ -7,9 +7,10 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="FreeSql.DbContext" Version="3.2.805" />
- <PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.805" />
- <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.0" />
+ <PackageReference Include="FreeSql.DbContext" Version="3.2.812" />
+ <PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.812" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.2" />
+ <PackageReference Include="Xunit.DependencyInjection" Version="8.9.1" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -15,7 +15,7 @@
  <Copyright>MIT License</Copyright>
  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  <PackageProjectUrl>https://github.com/luoyunchong/FreeKit</PackageProjectUrl>
- <Version>0.0.536</Version>
+ <Version>0.0.537</Version>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/...n.AspNetCore.DataProtection.FreeRedis/IGeekFan.AspNetCore.DataProtection.FreeRedis.csproj b/...n.AspNetCore.DataProtection.FreeRedis/IGeekFan.AspNetCore.DataProtection.FreeRedis.csproj
@@ -11,7 +11,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="FreeRedis" Version="1.2.5" />
- <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="8.0.0" />
+ <PackageReference Include="FreeRedis" Version="1.2.13" />
+ <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="8.0.2" />
  </ItemGroup>
 </Project>
diff --git a/...ekFan.AspNetCore.DataProtection.FreeSql/IGeekFan.AspNetCore.DataProtection.FreeSql.csproj b/...ekFan.AspNetCore.DataProtection.FreeSql/IGeekFan.AspNetCore.DataProtection.FreeSql.csproj
@@ -8,8 +8,8 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="FreeSql.DbContext" Version="3.2.805" />
+ <PackageReference Include="FreeSql.DbContext" Version="3.2.812" />
  <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="6.0.0" />
- <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="8.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="8.0.2" />
  </ItemGroup>
 </Project>
diff --git a/src/IGeekFan.AspNetCore.Identity.FreeSql/IGeekFan.AspNetCore.Identity.FreeSql.csproj b/src/IGeekFan.AspNetCore.Identity.FreeSql/IGeekFan.AspNetCore.Identity.FreeSql.csproj
@@ -10,9 +10,9 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="FreeSql" Version="3.2.805" />
- <PackageReference Include="FreeSql.DbContext" Version="3.2.805" />
- <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.0" />
+ <PackageReference Include="FreeSql" Version="3.2.812" />
+ <PackageReference Include="FreeSql.DbContext" Version="3.2.812" />
+ <PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="8.0.2" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/...gnostics.HealthChecks.FreeSql/IGeekFan.Extensions.Diagnostics.HealthChecks.FreeSql.csproj b/...gnostics.HealthChecks.FreeSql/IGeekFan.Extensions.Diagnostics.HealthChecks.FreeSql.csproj
@@ -12,8 +12,8 @@
 
  </PropertyGroup>
  <ItemGroup>
- <PackageReference Include="FreeSql.DbContext" Version="3.2.805" />
- <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.0" />
+ <PackageReference Include="FreeSql.DbContext" Version="3.2.812" />
+ <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.2" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/IGeekFan.FreeKit.Email/IGeekFan.FreeKit.Email.csproj b/src/IGeekFan.FreeKit.Email/IGeekFan.FreeKit.Email.csproj
@@ -8,7 +8,8 @@
  <ItemGroup>
  <PackageReference Include="MailKit" Version="4.3.0" />
  <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
- <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
  <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
+ <PackageReference Include="Xunit.DependencyInjection" Version="8.9.1" />
  </ItemGroup>
 </Project>
diff --git a/src/IGeekFan.FreeKit.Extras/IGeekFan.FreeKit.Extras.csproj b/src/IGeekFan.FreeKit.Extras/IGeekFan.FreeKit.Extras.csproj
@@ -11,8 +11,8 @@
 
  <ItemGroup>
  <FrameworkReference Include="Microsoft.AspNetCore.App" />
- <PackageReference Include="FreeSql.DbContext" Version="3.2.805" />
- <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
+ <PackageReference Include="FreeSql.DbContext" Version="3.2.812" />
+ <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
  <PackageReference Include="Autofac.Extras.DynamicProxy" Version="7.1.0" />
  <PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
  </ItemGroup>

diff --git a/src/IGeekFan.Localization.FreeSql/IGeekFan.Localization.FreeSql.csproj b/src/IGeekFan.Localization.FreeSql/IGeekFan.Localization.FreeSql.csproj
@@ -8,7 +8,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="FreeSql" Version="3.2.805" />
- <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />
+ <PackageReference Include="FreeSql" Version="3.2.812" />
+ <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.2" />
  </ItemGroup>
 </Project>
diff --git a/...Core.DataProtection.FreeSql.Tests/IGeekFan.AspNetCore.DataProtection.FreeSql.Tests.csproj b/...Core.DataProtection.FreeSql.Tests/IGeekFan.AspNetCore.DataProtection.FreeSql.Tests.csproj
@@ -9,15 +9,16 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.805" />
+ <PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.812" />
  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
- <PackageReference Include="xunit" Version="2.6.1" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+ <PackageReference Include="xunit" Version="2.7.0" />
+ <PackageReference Include="Xunit.DependencyInjection" Version="8.9.1" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>
- <PackageReference Include="coverlet.collector" Version="6.0.0">
+ <PackageReference Include="coverlet.collector" Version="6.0.1">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>

diff --git a/...GeekFan.AspNetCore.Identity.FreeSql.Test/IGeekFan.AspNetCore.Identity.FreeSql.Test.csproj b/...GeekFan.AspNetCore.Identity.FreeSql.Test/IGeekFan.AspNetCore.Identity.FreeSql.Test.csproj
@@ -17,19 +17,20 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="FreeSql.Provider.SqliteCore" Version="3.2.805" />
+ <PackageReference Include="FreeSql.Provider.SqliteCore" Version="3.2.812" />
  <PackageReference Include="Microsoft.AspNetCore.Identity.Specification.Tests" Version="5.0.17" />
- <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
- <PackageReference Include="Moq" Version="4.20.69" />
+ <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.2" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+ <PackageReference Include="Moq" Version="4.20.70" />
  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
- <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.6" />
- <PackageReference Include="xunit" Version="2.6.1" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+ <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.8" />
+ <PackageReference Include="xunit" Version="2.7.0" />
+ <PackageReference Include="Xunit.DependencyInjection" Version="8.9.1" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>
- <PackageReference Include="coverlet.collector" Version="6.0.0">
+ <PackageReference Include="coverlet.collector" Version="6.0.1">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>

diff --git a/...lthChecks.FreeSql.Tests/IGeekFan.Extensions.Diagnostics.HealthChecks.FreeSql.Tests.csproj b/...lthChecks.FreeSql.Tests/IGeekFan.Extensions.Diagnostics.HealthChecks.FreeSql.Tests.csproj
@@ -9,16 +9,17 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.805" />
- <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
+ <PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.812" />
+ <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.2" />
  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
- <PackageReference Include="xunit" Version="2.6.1" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+ <PackageReference Include="xunit" Version="2.7.0" />
+ <PackageReference Include="Xunit.DependencyInjection" Version="8.9.1" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>
- <PackageReference Include="coverlet.collector" Version="6.0.0">
+ <PackageReference Include="coverlet.collector" Version="6.0.1">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>

diff --git a/test/IGeekFan.FreeKit.xUnit/IGeekFan.FreeKit.xUnit.csproj b/test/IGeekFan.FreeKit.xUnit/IGeekFan.FreeKit.xUnit.csproj
@@ -8,21 +8,21 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.805" />
- <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
- <PackageReference Include="Xunit.DependencyInjection" Version="8.9.0" />
+ <PackageReference Include="FreeSql.Provider.Sqlite" Version="3.2.812" />
+ <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.2" />
+ <PackageReference Include="Xunit.DependencyInjection" Version="8.9.1" />
  <PackageReference Include="Microsoft.DependencyValidation.Analyzers" Version="0.11.0" />
  <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
  <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
- <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
+ <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
  <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
- <PackageReference Include="xunit" Version="2.6.1" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+ <PackageReference Include="xunit" Version="2.7.0" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>
- <PackageReference Include="coverlet.collector" Version="6.0.0">
+ <PackageReference Include="coverlet.collector" Version="6.0.1">
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>